conjoin 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 836e7101787f76311801fb2aa38035ce70c1ab58
-  data.tar.gz: 7d48b81888db49e598070a6820c634cc53eb92a9
+  metadata.gz: a98046cdb70b43968c5f2eeec7e1e2e45dd00db0
+  data.tar.gz: 6c3eb3f4690111a360f2e1412ff9bbbc3cccf8ea
 SHA512:
-  metadata.gz: f2aa96039522a96034f6bc7b8218c126afd371ab09f2faed7f39ebe14598ff96977537134a7dd4bb2ee740eaf252fe2075947885871e908171265423670b591f
-  data.tar.gz: d32d81c661e56e2baa6b2b4aee1abc3e5bee79cc4141291f21f0aa81386f0fba959414b3cccf274b9042d4755e6238e579bbe9ca8ee9ad0067fed3209834e55e
+  metadata.gz: 9f5974b32f4bc1a100e38db3bd222165fc3861614f6f5755ad45c76ce20413a576111858a57fe5efa34592fd3eb4ff6b12c3f40c1b6dc49b65fc9901d2b5e432
+  data.tar.gz: d246ac477c083f88ed31123ec48e0c05b9fa498604e14a6ad3e5ece8233f1fe7687689c7795ab1f5c3f429b25507f61f4c6a849516e40f65422ae2d0ead32c4e

data/lib/conjoin/assets.rb

@@ -166,20 +166,34 @@ module Conjoin
         dir     = ''
         new_ext = false
 
+        case file
+        when /^bower/
+          dir = 'assets/'
+        when /^widgets/
+          dir = '/'
+        else
+          case ext
+          when 'js'
+            dir = 'assets/javascripts/'
+          when 'css'
+            dir = 'assets/stylesheets/'
+          else
+            dir = 'assets/'
+          end
+        end
+
         case ext
         when 'css'
-          dir     = !file[/^bower/] ? 'stylesheets/' : ''
           new_ext = 'scss' if stylesheet_assets.include? file + '.scss'
         when 'js'
-          dir     = !file[/^bower/] ? 'javascripts/' : ''
           new_ext = 'coffee' if javascript_assets.include? file + '.coffee' \
                              or javascript_head_assets.include? file + '.coffee'
         end
 
         if new_ext
-          render "#{Assets.app.root}/app/assets/#{dir}#{file}.#{new_ext}"
+          render "#{Assets.app.root}/app/#{dir}#{file}.#{new_ext}"
         else
-          File.read "#{Assets.app.root}/app/assets/#{dir}#{file}.#{ext}"
+          File.read "#{Assets.app.root}/app/#{dir}#{file}.#{ext}"
         end
       end
 

data/lib/conjoin/version.rb

@@ -1,3 +1,3 @@
 module Conjoin
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/conjoin/widgets.rb

@@ -48,7 +48,7 @@ module Conjoin
       widget = req.env[:loaded_widgets][name]
 
       if widget.method(state).parameters.length > 0
-        widget.send state, opts
+        widget.send state, opts.to_ostruct
       else
         widget.send state
       end
@@ -278,7 +278,7 @@ module Conjoin
 
         if locals.key?(:state) and state and state.to_s == view.to_s
           if method(state).parameters.length > 0
-            send(state, locals)
+            send(state, locals.to_ostruct)
           else
             send(state)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjoin
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - cj