roda-component 0.1.45 → 0.1.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39c23aab38d3e58a29f3ba6219547391dd786f9
-  data.tar.gz: a1c09993e3f2bd1ffb9454a9555e0a9c9699ac39
+  metadata.gz: a37accc2a509987a4cc84739978f698929bb74cc
+  data.tar.gz: 1c60476fc587fa408012bf6565c0b142f288a5d3
 SHA512:
-  metadata.gz: 7605b345bb3b759b63f3cb354343b08c6d4267b1ff20f9bdebfeab163c789479ab43958f33ae826546584ae9adb76c18fd544b4e96c6f14be5687d82103a72a5
-  data.tar.gz: 06dc352dd091b618d3621063be4c842711464ff45188409b856d7eccc83f0b81831fa9dab4b1a7772b4719ce155fafba98729b2a4b9c06dfd15dc8d5c818d752
+  metadata.gz: 113ef63e5eb521f6a4bf282c6f721f506155e55aee3bcfa04e01864af1a135d7327808d70ae334426fa353cf70efd183bbe86843195b6b8c2a63bbf4a6530564
+  data.tar.gz: 82dae7f4f53186c30cc4e41a81daa1cf58455a95ebccb28aad09ea7e57ceb48cf5a4ca76d7f1cda70e7538e08daadf80ef71470aa73c749d950b7edea3f06725

data/lib/roda/component.rb

@@ -126,10 +126,25 @@ class Roda
     class << self
       attr_accessor :_name
 
+      def file_location
+        @_file_location
+      end
+
       def new(*args, &block)
         obj = self.allocate
         obj.instance_variable_set :@_scope, args.shift
-        obj.send :initialize, *args, &block
+
+        # don't send any args if none are wanted
+        if server?
+          if obj.method(:initialize).parameters.length > 0
+            obj.send :initialize, *args, &block
+          else
+            obj.send :initialize, &block
+          end
+        else
+          obj.send :initialize, *args, &block
+        end
+
         obj._initialize
         obj
       end
@@ -218,6 +233,7 @@ class Roda
         @_name = _name.to_s
 
         if server?
+          @_file_location = caller.first.split(':').first
           component_opts[:class_name][@_name] = self.to_s
         end
       end

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.45"
+    VERSION = "0.1.46"
   end
 end

data/lib/roda/plugins/component.rb

@@ -91,9 +91,7 @@ class Roda
           comp_name  = comp.class._name
           class_name = Base64.encode64 component_opts[:class_name].to_json
 
-          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')
+          file_path = comp.class.file_location.gsub("#{Dir.pwd}/#{component_opts[:path]}", '').gsub(/\.rb\Z/, '.js')
 
           js = <<-EOF
             action = '#{action || 'false'}'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.45
+  version: 0.1.46
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal