robot_catcher 0.0.3 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzZmYzkxZWVhZTdhNWRiMmY3YWYwNDAzMzU5OTY1MDhjNWU1ZGVjOQ==
+    Y2Q2YzM4OWY4YzYzYWZhYmVmNDMxMjkxM2U3ZDhmOWJiZmU4OWZjNQ==
   data.tar.gz: !binary |-
-    ZDAyMzlmMmViNWI5ZjZlOGViZjJlZmI5MDc5OWJkZGQ3NjFkYzM4OA==
+    YTA5NDE1YTQxY2Y2Yzc4NGUzMGQ2OTZkMDRmODU0MTUwNzM5OWJiYQ==
 SHA512:
   metadata.gz: !binary |-
-    NTkzNjIzOWIyZjU2M2Y4YjdmYzZiOThmMjkyMTcwZDY2OTAwNGMxYzk5N2I2
-    MDA5MGRjN2E3YzUxOTg1ZDdkZWFhOTQ1YzQ3YjBmNTAxMTJhZjdlNGE5MzQy
-    YzdiM2UxNmM1MmZjNTMzNTJlNDBlNDQxMzQ3NjI1NGE4ZTNkOWY=
+    MzBjMDc3YTdlNTIzNzVjZDU2YWM1ZGNlODAxMWMyY2I5MmMzYjYzNzViZTAy
+    NzA0YTdmYzMxODk0ODE4YjBmZWMwZmIwMzM2NGU0YTdmYzg2ODRkNTgxYTk2
+    YTE3Mzg5MmZiNTY5NmFiN2U1ZGFjZjI0Y2IzNmViMzFlNmEzMmI=
   data.tar.gz: !binary |-
-    ZTg4MTUyOGYwMjM0ZjQ4ODIyMWY0NTI5YmQ0ZjQ3MzNiZGY2ZGJhNTRiYjNi
-    MjI5OTA1YjFjNDZkMTBmMThlZTY0NzBlY2JkMjMwODU4ZDkzMjYxODM0OWIw
-    NGY0ZjhlZDRkNjg1MjY1ZWEzNjkzODQ1MDU3M2ZkNTI4ZmZiNTA=
+    MTU4NGUzMmMxZTQ5OTExNWY3MmFiOTNjODE2Yzk2NDQ2MWE3YWI4MDZhZmQz
+    NDI3OWMyMDJhNzg1ODE3ZTU3MTU0NmM4ZTM2ZWFkNDZhZTZlYzFlNGQwZGJj
+    NzYxZTFjMjM0YzU5ZTNlZWRhMGU3MTg1MGYwYjc5ZWNkY2Y0MWU=

data/README.md

@@ -105,6 +105,7 @@ use `rc_form_for` like in the example above.
 ## UPCOMING NEXT
 + Store robot catches in database
 + Configuration (e.g. for a secret that is used for hashing)
++ Better usage of concerns
 + More [DRY](https://en.wikipedia.org/wiki/Don%27t_repeat_yourself "Don't Repeat Yourself")
 
 ### To be considered

data/lib/robot_catcher/helpers.rb

@@ -57,96 +57,100 @@ module RobotCatcher
         #     end                                    # end
         #   RUBY_EVAL
         # end
-      end
-
-      def rc_form_tag(url_for_options = {}, options = {}, &block)
-        if !options.has_key? :ip
-          raise ArgumentError, "should include ip address"
+      
+        def rc_form_tag(url_for_options = {}, options = {}, &block)
+          if !options.has_key? :ip
+            raise ArgumentError, "should include ip address"
+          end
+          ip = options.delete(:ip)
+
+          timestamp = Time.now.to_i.to_s
+          # p "To be spinned (front-end): #{timestamp}#{ip}robotcatcher"
+          @spinner = Digest::MD5.hexdigest(timestamp + ip.to_s + "robotcatcher")
+
+          options[:spinner] = @spinner
+
+          html_options = options[:html] ||= {}
+
+          html_options[:data]   = options.delete(:data)   if options.has_key?(:data)
+          html_options[:remote] = options.delete(:remote) if options.has_key?(:remote)
+          html_options[:method] = options.delete(:method) if options.has_key?(:method)
+          html_options[:enforce_utf8] = options.delete(:enforce_utf8) if options.has_key?(:enforce_utf8)
+          html_options[:authenticity_token] = options.delete(:authenticity_token)
+
+          builder = RobotCatcher::Helpers::FormBuilder.new(nil, nil, self, options)
+          content = capture(builder, &block)
+          html_options[:multipart] ||= builder.multipart?
+
+          html_options = html_options_for_form(url_for_options, html_options)
+          
+          if block_given?
+            output = form_tag_html(html_options)
+            output.safe_concat(hidden_field_tag(:timestamp, timestamp))
+            output.safe_concat(hidden_field_tag(:spinner, @spinner))
+            output << content
+            output.safe_concat("</form>")
+          else
+            output = form_tag_html(html_options)
+            output.safe_concat(hidden_field_tag(:timestamp, timestamp))
+            output.safe_concat(hidden_field_tag(:spinner, @spinner))
+          end
         end
-        ip = options.delete(:ip)
-
-        timestamp = Time.now.to_i.to_s
-        # p "To be spinned (front-end): #{timestamp}#{ip}robotcatcher"
-        @spinner = Digest::MD5.hexdigest(timestamp + ip.to_s + "robotcatcher")
+      end
+    end
 
-        options[:spinner] = @spinner
+    module FormHelper
+      extend ActiveSupport::Concern
 
-        html_options = options[:html] ||= {}
+      included do
+        def rc_form_for(record, *args, &block)
+          options = args.extract_options!
+          if !options.has_key? :ip
+            raise ArgumentError, "should include ip address"
+          end
+          ip = options.delete(:ip)
+          
+          timestamp = Time.now.to_i.to_s
+          # p "To be spinned (front-end): #{timestamp}#{ip}robotcatcher"
+          spinner = Digest::MD5.hexdigest(timestamp + ip.to_s + "robotcatcher")
+          
+          options[:spinner] = spinner
+
+          raise ArgumentError, "Missing block" unless block_given?
+          html_options = options[:html] ||= {}
+
+          case record
+          when String, Symbol
+            object_name = record
+            object      = nil
+          else
+            object      = record.is_a?(Array) ? record.last : record
+            raise ArgumentError, "First argument in form cannot contain nil or be empty" unless object
+            object_name = options[:as] || object.class.name.downcase
+            apply_form_for_options!(record, options)
+          end
 
-        html_options[:data]   = options.delete(:data)   if options.has_key?(:data)
-        html_options[:remote] = options.delete(:remote) if options.has_key?(:remote)
-        html_options[:method] = options.delete(:method) if options.has_key?(:method)
-        html_options[:enforce_utf8] = options.delete(:enforce_utf8) if options.has_key?(:enforce_utf8)
-        html_options[:authenticity_token] = options.delete(:authenticity_token)
+          html_options[:data]   = options.delete(:data)   if options.has_key?(:data)
+          html_options[:remote] = options.delete(:remote) if options.has_key?(:remote)
+          html_options[:method] = options.delete(:method) if options.has_key?(:method)
+          html_options[:enforce_utf8] = options.delete(:enforce_utf8) if options.has_key?(:enforce_utf8)
+          html_options[:authenticity_token] = options.delete(:authenticity_token)
 
-        builder = RobotCatcher::Helpers::FormBuilder.new(nil, nil, self, options)
-        content = capture(builder, &block)
-        html_options[:multipart] ||= builder.multipart?
+          builder = RobotCatcher::Helpers::FormBuilder.new(object_name, object, self, options)
+          content = capture(builder, &block)
+          html_options[:multipart] ||= builder.multipart?
 
-        html_options = html_options_for_form(url_for_options, html_options)
-        
-        if block_given?
+          html_options = html_options_for_form(options[:url] || {}, html_options)
+          
           output = form_tag_html(html_options)
           output.safe_concat(hidden_field_tag(:timestamp, timestamp))
-          output.safe_concat(hidden_field_tag(:spinner, @spinner))
+          output.safe_concat(hidden_field_tag(:spinner, spinner))
           output << content
           output.safe_concat("</form>")
-        else
-          output = form_tag_html(html_options)
-          output.safe_concat(hidden_field_tag(:timestamp, timestamp))
-          output.safe_concat(hidden_field_tag(:spinner, @spinner))
         end
       end
     end
 
-    module FormHelper
-      def rc_form_for(record, *args, &block)
-        options = args.extract_options!
-        if !options.has_key? :ip
-          raise ArgumentError, "should include ip address"
-        end
-        ip = options.delete(:ip)
-        
-        timestamp = Time.now.to_i.to_s
-        # p "To be spinned (front-end): #{timestamp}#{ip}robotcatcher"
-        spinner = Digest::MD5.hexdigest(timestamp + ip.to_s + "robotcatcher")
-        
-        options[:spinner] = spinner
-
-        raise ArgumentError, "Missing block" unless block_given?
-        html_options = options[:html] ||= {}
-
-        case record
-        when String, Symbol
-          object_name = record
-          object      = nil
-        else
-          object      = record.is_a?(Array) ? record.last : record
-          raise ArgumentError, "First argument in form cannot contain nil or be empty" unless object
-          object_name = options[:as] || object.class.name.downcase
-          apply_form_for_options!(record, options)
-        end
-
-        html_options[:data]   = options.delete(:data)   if options.has_key?(:data)
-        html_options[:remote] = options.delete(:remote) if options.has_key?(:remote)
-        html_options[:method] = options.delete(:method) if options.has_key?(:method)
-        html_options[:enforce_utf8] = options.delete(:enforce_utf8) if options.has_key?(:enforce_utf8)
-        html_options[:authenticity_token] = options.delete(:authenticity_token)
-
-        builder = RobotCatcher::Helpers::FormBuilder.new(object_name, object, self, options)
-        content = capture(builder, &block)
-        html_options[:multipart] ||= builder.multipart?
-
-        html_options = html_options_for_form(options[:url] || {}, html_options)
-        
-        output = form_tag_html(html_options)
-        output.safe_concat(hidden_field_tag(:timestamp, timestamp))
-        output.safe_concat(hidden_field_tag(:spinner, spinner))
-        output << content
-        output.safe_concat("</form>")
-      end
-    end
-
   end
 end
 

data/lib/robot_catcher/models.rb

@@ -2,7 +2,7 @@ module RobotCatcher
   module Models
     extend ActiveSupport::Concern
 
-    module ClassMethods
+    included do 
       def robot_catch(*params)
         @@rc_params = params
 

data/lib/robot_catcher/version.rb

@@ -1,3 +1,3 @@
 module RobotCatcher
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: robot_catcher
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Mike Voets