roda-component 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6709c88bb551e2d62fc3991f8faaec4d71f5105e
-  data.tar.gz: 8487b6adbe4e685e24bb7184632f6547dd34ac59
+  metadata.gz: d0d11690e0fcadcb8e039e0da837a1e66d87f128
+  data.tar.gz: 383600a90a2d5ba621a5ad2208923a056e5a7416
 SHA512:
-  metadata.gz: b054a490aac393f350a01c8a3bd9986d94e3f1365f0aabe6ea5b2b4bb7239a82173341837aeb2a520f33fe5fe3b3222f3495afb51375d92d452b804335e3b7e2
-  data.tar.gz: a896624d7dfd0734d2a90abaf80a81bfae32e7bc27b2d2514e1cfdfd916b689b493df230048b18c1997dd8e8ba9330ea907a71c758d6f1ba41b4216b5b48b189
+  metadata.gz: dfbd1b842323e8bd39b3f822e80cd1c7e537bb7c6e4df5f729fe3df69793867d17d30dfcb22e4776150cbc6339a9785305a6a9459ca2e06583043a2a3cb0bb6d
+  data.tar.gz: 8d37da4c0faf072c3cfa0553404f5f7ad1b01a1913ba9f6e5df4f264a11cb97ff29859968e60f324851f4e1ec900eb90ea0649005620f1d21e7de4277258cb79

data/README.md

@@ -1,31 +1,6 @@
 # Roda::Component
 
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'roda-component'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install roda-component
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/roda-component/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+## todo
+  - create a simple store object for each component
+  - have a comp_id class method where you can put logic in for generating unique id
+    this is mainly used to the store

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/lib/roda/plugins/component.rb

@@ -95,7 +95,13 @@ class Roda
             end
           EOF
 
-          loaded_component_js << ("<script>" + Opal.compile(js) + "</script>")
+          loaded_component_js << ("<script>#{Opal.compile(js)}</script>")
+
+          file_path = comp.class.instance_methods(false).map { |m|
+              comp.class.instance_method(m).source_location.first
+          }.uniq.first.gsub("#{Dir.pwd}/#{component_opts[:path]}", '').gsub(/\.rb\Z/, '.js')
+
+          loaded_component_js << "<script type=\"text/javascript\" src=\"/#{component_opts[:assets_route]}#{file_path}\"></script>"
         end
 
         def component name, options = {}, &block
@@ -138,7 +144,7 @@ class Roda
         alias :roda_component :component
 
         def component_js
-          loaded_component_js.join('\n').to_s
+          loaded_component_js.join(' ').to_s
         end
       end
 
@@ -175,33 +181,26 @@ class Roda
 
       module RequestMethods
         def components
-          on self.class.component_assets_route_regex do |component, action|
-            # Process the ruby code into javascript
-            Opal::Processor.source_map_enabled = false
-
-            opal = Opal::Server.new do |s|
-              # Append the gems path
-              s.append_path Dir.pwd
-              s.append_path Gem::Specification.find_by_name("roda-component").gem_dir + '/lib'
-              # s.append_path Gem::Specification.find_by_name("scrivener-cj").gem_dir + '/lib'
-              # Append the path to the components folder
-              s.append_path scope.component_opts[:path]
-
-              s.main = 'application'
-            end
+          opal = Opal::Server.new do |s|
+            # Append the gems path
+            s.debug = true
+            s.source_map = true
+            s.append_path Gem::Specification.find_by_name("roda-component").gem_dir + '/lib'
 
-            sprockets = opal.sprockets
+            # Append the path to the components folder
+            s.append_path scope.component_opts[:path]
 
-            js = sprockets['roda/component'].to_s
-            # Loop through and and convert all the files to javascript
-            Dir[scope.component_opts[:path] + '/**/*.rb'].each do |file|
-              file = file.gsub(scope.component_opts[:path] + '/', '')
-              js << sprockets[file].to_s
-            end
-            # Set the header to javascript
-            response.headers["Content-Type"] = 'application/javascript; charset=UTF-8'
+            s.main = 'roda/component'
+          end
+
+          on self.class.component_assets_route_regex do |component, action|
+            path = scope.request.env['REQUEST_PATH']
 
-            js
+            if path[/\.js\Z/]
+              run opal.sprockets
+            else
+              run Opal::SourceMapServer.new(opal.sprockets, path)
+            end
           end
 
           on self.class.component_route_regex do |comp, type, action|

data/test/dummy/app.rb

@@ -41,7 +41,7 @@ class TestApp < Roda
     secret: "na"
 
   plugin :csrf, header: 'X-CSRF-TOKEN', skip: ['POST:/faye']
-  plugin :component, { path: path, token: '687^*&SAD876asd87as6d*&8asd' }
+  plugin :component, { path: 'components', token: '687^*&SAD876asd87as6d*&8asd' }
   plugin :assets, {
     path: "#{path}/../public/chat",
     css_dir: '',
@@ -80,8 +80,8 @@ class TestApp < Roda
 
     r.root { component(:chat, js: true) }
 
-    r.on('login') { component(:login, js: true) }
-    r.on('logout') { component(:login, call: :logout, js: true) }
+    r.on('login')  { component(:login, js: true) }
+    r.on('logout') { component(:login, call: :logout) }
 
     r.on 'session/:key/:value' do |key, value|
       session[key] = value

data/test/dummy/components/layout.rb

@@ -8,7 +8,7 @@ class LayoutComp < Roda::Component
     dom.at_css('head').add_child assets(:css)
     dom.at_css('html').add_child assets(:js)
     dom.at_css('html').add_child <<-EOF
-      <script type="text/javascript" src="/assets/components"></script>
+      <script type="text/javascript" src="/assets/components/roda/component.js"></script>
       <script type="text/javascript" src="/faye/client.js"></script>
     EOF
   end

data/test/dummy/components/login.rb

@@ -1,3 +1,5 @@
+require_relative 'forms/login'
+
 class LoginComponent < Roda::Component
   comp_name :login
   comp_html "../public/chat/login.html"
@@ -17,7 +19,7 @@ class LoginComponent < Roda::Component
   end
 
   def logout
-    logout(Models::User)
+    super(Models::User)
     request.redirect 'login'
   end
 
@@ -97,11 +99,6 @@ class LoginComponent < Roda::Component
 
   protected
 
-  def logout
-    logout(Models::User)
-    request.redirect 'login'
-  end
-
   def display_errors errors
     errors.each do |key, error|
       error = error.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - cj