stitch-plus 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzQ0NDc2ZjVkNmEyMGY4ZDVjYjUwOTBhN2FiNjBhODM3MDQ4NTBhNw==
+    MzhlZjFmOGVjNzAzNWQ5NDY3MWY0MDEzNzZjZjE1MDQ2Njc0M2YyYg==
   data.tar.gz: !binary |-
-    MTk3MWNkYTY3ZGQ2MDY5ZGViMmEyMWZjNWVjNWU3Y2FjMDdjNjU5Yg==
+    OTFmYjU5OGE3NmVjZGNkNzY0MTAxYTNkNDUzMjk1Yjc3NGJlNTQ2MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Yjg5ZTM0M2E4MGFiMzkyOTQ0N2M1NWY1NjQ2OTc2MzUwNmY4ZTM3MGU4MjZl
-    ODI5NTczNTRmZWZjNmY5MTFiMmNiOWYyNDIxZDA1MzE2ZjNkNTQyODMxZWMz
-    MGY1M2Y4MDQ3NGQ2ZDFkNGIwNTA1ODZiZDlhZWVlNzI3YzlkZjM=
+    NmNiYWM1NmEwN2E3YTAzZjYwMjEyMjNhNjUyMjIxM2M3YzA0NTlkZmE3NTBj
+    ZDEwOGM0MDIyMDdiMDE0MzBhMDNlMDUwYWU4YTA0NzlmNzc2ODBlNTE1ODQ0
+    YmVjYTRmZTNmNDRkYzI0MjdkZThmZmQ1OTIyMTI1YTM5ZDA5N2I=
   data.tar.gz: !binary |-
-    MjBkNDcyZDRiNTk0ZWJjMmM3Yzc5NjgwNmI0ZTNhMjA1Y2EzYTU4ZmQzNTNk
-    YzYyMWJhYjA4ZWQwZWM5ODEzMDljZDlhMmM3OWZlMTgxZGUwYmZlOWQ2MzNm
-    YjM4Y2UxOGM3YTAxYjVhMjc2MmZkYWU1Yzc1ZjMyZjFmMDExMzg=
+    NmIxZTRiMzJlMDE1Nzc0MzBkNmYzNjg2ZWU2ZDZlZTQwNTVhNjNhZTU0MTZl
+    N2VkOWI0ZGI4MGJiYTcwYjExY2I1ZTQxMjIxN2QyNjc4ODYzYzc0YjkwNTU3
+    MjVkNjFkY2E2MTk3ODE0MmFlNzJjZTJiOGNmMDcwZGYyNTY0ODI=

data/CHANGELOG.md

@@ -16,3 +16,5 @@
 ## 1.0.3
 - Fixed an issue where write was attempting to call old build method.
 
+## 1.0.4
+- Options hash now accepts `config` which can point to a YAML file to load configurations.

data/README.md

@@ -25,7 +25,7 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-# options can be a hash or a path to a yaml file
+# options can be a hash or a path to a YAML file
 s = StitchPlus.new(options)
 
 # Returns compiled javascript
@@ -53,7 +53,6 @@ s.options
 
 All methods will accept an options hash which will temporarily override previous options options, for example:
 
-
 ```
 s.write({fingerprint: 'false'})
 ```
@@ -63,10 +62,11 @@ This will disable fingerprinting of the filename temporarily and write to app.js
 
 ## Configuration
 
-You can configure StichPlus as like this.
+Stitch Plus will accept a hash of options or a string containing a path to a YAML file. 
 
 | Config           | Description                                                                | Default     |
 |:-----------------|:---------------------------------------------------------------------------|:------------|
+| `config`         | A path to a YAML file containing stitch configurations                     | nil         |
 | `dependencies`   | Array of files/directories to be added first as global javascripts         | nil         |
 | `paths`          | Array of directories where javascripts will be wrapped as CommonJS modules | nil         |
 | `output`         | A path to write the compiled javascript                                    | 'all.js'    |
@@ -75,7 +75,10 @@ You can configure StichPlus as like this.
 | `uglify`         | Smash javascript using the Uglifier gem                                    | false       |
 | `uglify_options` | Options for the Uglifier gem. See the [Uglifier docs](https://github.com/lautis/uglifier#usage) for details. | {}       |
 
-### Reading configuration from a file
+Note: Configurations loaded from a YAML file will override any settings in your config hash. So `{config: 'stitch.yml', uglify: false}` will be overwritten if the yaml
+file sets `uglify: true`.
+
+### Configuring with YAML
 
 Stitch can also read configurations from a YAML file. For example, you could
 create a `stitch.yml` containing the following:
@@ -91,7 +94,7 @@ stitch:
 Then you could call stitch like this:
 
 ```ruby
-js = StitchPlus.new('stitch.yml').compile
+js = StitchPlus.new({config: 'stitch.yml'}).compile
 ```
 
 ### Regarding "Dependencies"

data/lib/stitch-plus.rb

@@ -15,7 +15,8 @@ class StitchPlus
       :fingerprint    => false,
       :cleanup        => true,
       :uglify         => false,
-      :uglify_options => {}
+      :uglify_options => {},
+      :config         => nil
     }
 
     set_options(options)
@@ -33,9 +34,8 @@ class StitchPlus
     @old_options = @options if temporary
 
     # If options is a file path, read options from yaml
-    if options.class == String and File.exist? options
-      options = load_options(options)
-    end
+    options = { :config => options } if options.class == String
+    options = load_options(options)
 
     @options = @options.merge symbolize_keys(options)
 
@@ -47,7 +47,6 @@ class StitchPlus
       end
     end
 
-    @options
   end
 
   def temp_options(options)
@@ -201,9 +200,12 @@ class StitchPlus
     end
   end
 
-  def load_options(file)
-    options = YAML::load(File.open(file)) if File.exist? file
-    options = options['stitch'] unless options['stitch'].nil?
+  def load_options(options)
+    if options[:config] and File.exist? options[:config]
+      config = YAML::load(File.open(options[:config]))
+      config = config['stitch'] unless config['stitch'].nil?
+      options = options.merge config
+    end
     options
   end
 

data/lib/stitch-plus/version.rb

@@ -1,3 +1,3 @@
 module StitchPlusVersion
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/test.rb

@@ -1,9 +1,9 @@
 require '../lib/stitch-plus'
 
 
-s = StitchPlus.new('stitch.yml')
+s = StitchPlus.new({config: 'stitch.yml'})
 
 puts "Javascripts to be compiled:"
 puts s.all_files.map { |f| "  #{f}"}
 
-puts s.compile
+s.write

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stitch-plus
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Brandon Mathis