diff --git a/Gemfile b/Gemfile index b4d66ba..b700031 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,6 @@ group :development do gem "github-pages" gem "tzinfo-data" - gem "foreman", "~> 0.63" - gem "serve", "~> 1.5" + gem "foreman" + gem "serve" end diff --git a/Gemfile.lock b/Gemfile.lock index d8185b6..682c357 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,56 +2,125 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - activesupport (3.2.14) + activesupport (3.2.22.5) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - classifier (1.3.3) - fast-stemmer (>= 1.0.0) + addressable (2.4.0) + blankslate (2.1.2.4) + classifier-reborn (2.1.0) + fast-stemmer (~> 1.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) colorator (0.1) - commander (4.1.5) - highline (~> 1.6.11) - directory_watcher (1.4.1) - dotenv (0.8.0) + ethon (0.10.1) + ffi (>= 1.3.0) + execjs (2.7.0) + faraday (0.10.1) + multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) - foreman (0.63.0) - dotenv (>= 0.7) - thor (>= 0.13.6) - github-pages (1) + ffi (1.9.14) + foreman (0.82.0) + thor (~> 0.19.1) + gemoji (2.1.0) + github-pages (39) RedCloth (= 4.2.9) - jekyll (= 1.1.2) - kramdown (= 1.0.2) - liquid (= 2.5.1) - maruku (= 0.6.1) - rdiscount (= 1.6.8) - redcarpet (= 2.2.2) - highline (1.6.19) - i18n (0.6.5) - jekyll (1.1.2) - classifier (~> 1.3) + github-pages-health-check (~> 0.2) + jekyll (= 2.4.0) + jekyll-coffeescript (= 1.0.1) + jekyll-feed (= 0.3.1) + jekyll-mentions (= 0.2.1) + jekyll-redirect-from (= 0.8.0) + jekyll-sass-converter (= 1.3.0) + jekyll-sitemap (= 0.8.1) + jemoji (= 0.5.0) + kramdown (= 1.5.0) + liquid (= 2.6.2) + maruku (= 0.7.0) + mercenary (~> 0.3) + pygments.rb (= 0.6.3) + rdiscount (= 2.1.7) + redcarpet (= 3.3.2) + terminal-table (~> 1.4) + github-pages-health-check (0.3.2) + net-dns (~> 0.6) + public_suffix (~> 1.4) + typhoeus (~> 0.7) + html-pipeline (1.9.0) + activesupport (>= 2) + nokogiri (~> 1.4) + i18n (0.7.0) + jekyll (2.4.0) + classifier-reborn (~> 2.0) colorator (~> 0.1) - commander (~> 4.1.3) - directory_watcher (~> 1.4.1) - kramdown (~> 1.0.2) - liquid (~> 2.5.1) - maruku (~> 0.5) - pygments.rb (~> 0.5.0) - redcarpet (~> 2.2.2) - safe_yaml (~> 0.7.0) - kramdown (1.0.2) - liquid (2.5.1) - maruku (0.6.1) - syntax (>= 1.0.0) - multi_json (1.7.9) - posix-spawn (0.3.6) - pygments.rb (0.5.2) + jekyll-coffeescript (~> 1.0) + jekyll-gist (~> 1.0) + jekyll-paginate (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 2.6.1) + mercenary (~> 0.3.3) + pygments.rb (~> 0.6.0) + redcarpet (~> 3.1) + safe_yaml (~> 1.0) + toml (~> 0.1.0) + jekyll-coffeescript (1.0.1) + coffee-script (~> 2.2) + jekyll-feed (0.3.1) + jekyll-gist (1.4.0) + octokit (~> 4.2) + jekyll-mentions (0.2.1) + html-pipeline (~> 1.9.0) + jekyll (~> 2.0) + jekyll-paginate (1.1.0) + jekyll-redirect-from (0.8.0) + jekyll (>= 2.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-sitemap (0.8.1) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + jemoji (0.5.0) + gemoji (~> 2.0) + html-pipeline (~> 1.9) + jekyll (>= 2.0) + kramdown (1.5.0) + liquid (2.6.2) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + maruku (0.7.0) + mercenary (0.3.6) + mini_portile2 (2.1.0) + multi_json (1.12.1) + multipart-post (2.0.0) + net-dns (0.8.0) + nokogiri (1.7.0.1) + mini_portile2 (~> 2.1.0) + octokit (4.6.2) + sawyer (~> 0.8.0, >= 0.5.3) + parslet (1.5.0) + blankslate (~> 2.0) + posix-spawn (0.3.12) + public_suffix (1.5.3) + pygments.rb (0.6.3) posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.1.0) - rack (1.5.2) - rack-test (0.6.2) + yajl-ruby (~> 1.2.0) + rack (1.5.5) + rack-test (0.6.3) rack (>= 1.0) - rdiscount (1.6.8) - redcarpet (2.2.2) - safe_yaml (0.7.1) + rb-fsevent (0.9.8) + rb-inotify (0.9.7) + ffi (>= 0.5.0) + rdiscount (2.1.7) + redcarpet (3.3.2) + safe_yaml (1.0.4) + sass (3.4.23) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) serve (1.5.2) activesupport (~> 3.2.12) i18n @@ -59,19 +128,30 @@ GEM rack-test (~> 0.6.2) tilt (~> 1.3.3) tzinfo - syntax (1.0.0) - thor (0.18.1) + terminal-table (1.7.3) + unicode-display_width (~> 1.1.1) + thor (0.19.4) + thread_safe (0.3.5) tilt (1.3.7) - tzinfo (1.0.1) - tzinfo-data (1.2013.4) + toml (0.1.2) + parslet (~> 1.5.0) + typhoeus (0.8.0) + ethon (>= 0.8.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + tzinfo-data (1.2016.10) tzinfo (>= 1.0.0) - yajl-ruby (1.1.0) + unicode-display_width (1.1.2) + yajl-ruby (1.2.1) PLATFORMS ruby DEPENDENCIES - foreman (~> 0.63) + foreman github-pages - serve (~> 1.5) + serve tzinfo-data + +BUNDLED WITH + 1.13.7 diff --git a/_config.yml b/_config.yml index 6214b0c..20fa234 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,6 @@ baseurl: '' safe: true -pygments: true +highlighter: pygments lsi: false markdown: redcarpet exclude: diff --git a/_data/chapters.yml b/_data/chapters.yml new file mode 100644 index 0000000..9c47918 --- /dev/null +++ b/_data/chapters.yml @@ -0,0 +1,16 @@ +--- +- Syntax +- Classes and Objects +- Strings +- Arrays +- Dates and Times +- Math +- Functions +- Metaprogramming +- jQuery +- Ajax +- Regular Expressions +- Networking +- Design Patterns +- Databases +- Testing diff --git a/_layouts/chapter.html b/_layouts/chapter.html index 3023ec9..3daeeed 100644 --- a/_layouts/chapter.html +++ b/_layouts/chapter.html @@ -1,22 +1,3 @@ ---- -chapters: -- Syntax -- Classes and Objects -- Strings -- Arrays -- Dates and Times -- Math -- Functions -- Metaprogramming -- jQuery -- Ajax -- Regular Expressions -- Networking -- Design Patterns -- Databases -- Testing ---- - @@ -72,7 +53,7 @@
ó
Chapters Index
    - {% for chapter in page.chapters %} + {% for chapter in site.data.chapters %} {% capture url %}/chapters/{{ chapter | replace: ' ', '_' | downcase }}{% endcapture %} {% capture indexurl %}{{ url }}/index.html{% endcapture %}
  1. @@ -97,4 +78,3 @@
    Chapters Index
    - diff --git a/_layouts/default.html b/_layouts/default.html index 9d8fe47..cbb539a 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,22 +1,3 @@ ---- -chapters: -- Syntax -- Classes and Objects -- Strings -- Arrays -- Dates and Times -- Math -- Functions -- Metaprogramming -- jQuery -- Ajax -- Regular Expressions -- Networking -- Design Patterns -- Databases -- Testing ---- - @@ -69,7 +50,7 @@
    ó
    Chapters Index
      - {% for chapter in page.chapters %} + {% for chapter in site.data.chapters %} {% capture url %}/chapters/{{ chapter | replace: ' ', '_' | downcase }}{% endcapture %} {% capture indexurl %}{{ url }}/index.html{% endcapture %}
    1. @@ -94,4 +75,3 @@
      Chapters Index
      - diff --git a/_layouts/recipe.html b/_layouts/recipe.html index 215830d..eb1a03c 100644 --- a/_layouts/recipe.html +++ b/_layouts/recipe.html @@ -1,22 +1,3 @@ ---- -chapters: -- Syntax -- Classes and Objects -- Strings -- Arrays -- Dates and Times -- Math -- Functions -- Metaprogramming -- jQuery -- Ajax -- Regular Expressions -- Networking -- Design Patterns -- Databases -- Testing ---- - @@ -71,7 +52,7 @@
      ó
      Chapters Index
        - {% for chapter in page.chapters %} + {% for chapter in site.data.chapters %} {% capture url %}/chapters/{{ chapter | replace: ' ', '_' | downcase }}{% endcapture %} {% capture indexurl %}{{ url }}/index.html{% endcapture %}
      1. @@ -96,4 +77,3 @@
        Chapters Index
        - diff --git a/authors.md b/authors.md index 3b3b236..d5181f6 100644 --- a/authors.md +++ b/authors.md @@ -34,6 +34,8 @@ The following people are totally rad and awesome because they have contributed r * Mike Moore *mike@blowmage.com* * Peter Hellberg *peter@c7.se* * Jamie Gaskins *jgaskins@gmail.com* +* Sami Pussinen *me@samipussinen.com* +* [Devin Weaver (@sukima)](https://github.com/sukima) * ...You! What are you waiting for? Check out the [contributing]({{ site.baseurl }}/contributing) section and get cracking! # Designers diff --git a/chapters/classes_and_objects/chaining.md b/chapters/classes_and_objects/chaining.md index be19212..d8d099e 100644 --- a/chapters/classes_and_objects/chaining.md +++ b/chapters/classes_and_objects/chaining.md @@ -66,9 +66,9 @@ class TeaCup cream: false addChainedAttributeAccessor(this, 'properties', attr) for attr of @properties -earlgrey = new TeaCup().size('small').type('Earl Grey').sugar('false') +earlgrey = new TeaCup().size('small').type('Earl Grey').sugar(false) -earlgrey.properties # => { size: 'small', type: 'Earl Grey', sugar: false } +earlgrey.properties # => { size: 'small', type: 'Earl Grey', sugar: false, cream: false } earlgrey.sugar true diff --git a/chapters/classes_and_objects/object-literal.md b/chapters/classes_and_objects/object-literal.md index 7d9d2f0..602ccf3 100644 --- a/chapters/classes_and_objects/object-literal.md +++ b/chapters/classes_and_objects/object-literal.md @@ -20,7 +20,29 @@ window.MY_NAMESPACE ?= {} This is equivalent to the following JavaScript: {% highlight javascript %} -window.MY_NAMESPACE = window.MY_NAMESPACE || {}; +if(window.MY_NAMESPACE === null || window.MY_NAMESPACE === undefined) { + window.MY_NAMESPACE = {}; +} {% endhighlight %} -Common JavaScript technique, using object literal to define a namespace. This saves us from clobbering the namespace if it already exists. +## Problem + +You want to make a conditonal assignment if it does not exists or if it is falsy (empty, 0, null, false) + +## Solution + +Use the Conditional assignment operator + +{% highlight coffeescript %} +window.my_variable ||= {} +{% endhighlight %} + +## Discussion + +This is equivalent to the following JavaScript: + +{% highlight javascript %} +window.my_variable = window.my_variable || {}; +{% endhighlight %} + +Common JavaScript technique, using conditional assignment to ensure that we have an object that is not falsy diff --git a/chapters/index.html b/chapters/index.html index 28abe74..51b99cf 100644 --- a/chapters/index.html +++ b/chapters/index.html @@ -1,22 +1,6 @@ --- layout: default title: Cookbook -chapters: -- Syntax -- Classes and Objects -- Strings -- Arrays -- Dates and Times -- Math -- Functions -- Metaprogramming -- jQuery -- Ajax -- Regular Expressions -- Networking -- Design Patterns -- Databases -- Testing ---         \ No newline at end of file + diff --git a/chapters/strings/finding-substrings.md b/chapters/strings/finding-substrings.md index a33af8c..ee81e89 100644 --- a/chapters/strings/finding-substrings.md +++ b/chapters/strings/finding-substrings.md @@ -24,8 +24,8 @@ message.indexOf "This", 5 message.lastIndexOf "This" # => 49 -{% endhighlight %} - -## Discussion +# Count occurrences of a given string +message.split(" a ").length - 1 +# => 3 -Still need recipe to count occurrences of a given string within a message. +{% endhighlight %} diff --git a/chapters/strings/replacing-sub-strings.md b/chapters/strings/replacing-sub-strings.md new file mode 100644 index 0000000..add9945 --- /dev/null +++ b/chapters/strings/replacing-sub-strings.md @@ -0,0 +1,29 @@ +--- +layout: recipe +title: Replacing Sub-Strings Within a String +chapter: Strings +--- +## Problem + +You want to replace a sub-string with a new sub-string. + +## Solution + +Split the string using the sub-string you want to remove as a delimiter. Then re-join using the new sub-string as the delimiter. + +{% highlight coffeescript %} +"Orange is the new Black".split("Orange").join("Pink") +# => "Pink is the new Black" + +"I am so sad. I cannot believe how sad I am today!".split("sad").join("happy") +# => "I am so happy. I cannot believe how happy I am today!" + +"I am not a crook.".split("not ").join("") +# => "I am a crook." +{% endhighlight %} + +## Discussion + +You can also use regexes. If you're matching an exact string, this way is simpler and 10x faster. + +If you use regexes, remember that you must escape certain characters. diff --git a/chapters/syntax/code_reuse_on_client_and_server.md b/chapters/syntax/code_reuse_on_client_and_server.md index f7a1aca..92e706b 100644 --- a/chapters/syntax/code_reuse_on_client_and_server.md +++ b/chapters/syntax/code_reuse_on_client_and_server.md @@ -57,7 +57,7 @@ undefined {% endhighlight %} -In our web page, we can include our module using by including it as a script. +In our web page, we can include our module by including it as a script. {% highlight html %}