push_type_core 0.6.0.beta.1 → 0.6.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d2e4ab5d33d0814637934a8bdcf85e998a5a59d
-  data.tar.gz: 69ef1e5c8346a126fb9de81c9287444666904a09
+  metadata.gz: 695f0cf51a3d8408ce92094dfe92610f6e079546
+  data.tar.gz: 727b6d4d5c39f6c0b3196362a113823e0a416fa5
 SHA512:
-  metadata.gz: aca95e9efd081d8c74567fc9f1a2350dd1b8ffb66efda6fcdfbd23e9d0ad559d00683f5335051862f60017080571f0963653fb056c21c4a5b64f03284d5e3caf
-  data.tar.gz: 8c8aa84c7ea8912e2fbb86904ddc922177a17fabcd6961a50b5cda08ea0376b72813705173af742f97be218aacbf11d920304ba72c0000aeba660ef8b73e2bee
+  metadata.gz: 374753265c5c609f1602a81d7f0138e0c47a96ace93124ba45bfda9d7c02772b4a29bbf760c12e8158e39d36d1da5903330949a987f74ccd93e5c63b63f2a9ac
+  data.tar.gz: 994a863f1bdb86cf7189ddb78f89dc10df1714fc66a4be0938b9bda6a6a088e88c15ee9613a84d2434af8824a4ec7e06fc18e133733808b006c868f27b3c24c2

data/app/fields/push_type/asset_field.rb

@@ -3,10 +3,6 @@ module PushType
 
     options template: 'asset'
 
-    def id_attr
-      "#{ name }-asset-modal"
-    end
-
     def relation_class
       PushType::Asset
     end

data/app/fields/push_type/matrix_field.rb

@@ -7,36 +7,31 @@ module PushType
     def initialize(*args, &block)
       super
       structure_class.class_eval(&block) if block
-      validate_field_types!
     end
 
     def value
       return if json_value.blank?
-      json_value.map do |h|
-        structure_class.new(field_store: h)
-      end
+      rows
     end
 
     def fields
       @fields ||= structure_class.new.fields
     end
 
-    private
-
-    def structure_class
-      @structure_class ||= PushType::Structure.clone
+    def rows
+      Array(json_value).map do |h|
+        structure_class.new(field_store: h)
+      end
     end
 
-    def validate_field_types!
-      fields.values.each do |f|
-        unless field_type_whitelist.include?(f.kind)
-          raise ArgumentError, "Invalid field type. `#{ kind }` cannot be used in #{ self.class.name }."
-        end
-      end
+    def structure
+      @structure ||= structure_class.new
     end
 
-    def field_type_whitelist
-      [:number, :string, :text]
+    private
+
+    def structure_class
+      @structure_class ||= PushType::Structure.clone
     end
 
   end

data/app/fields/push_type/relation_field.rb

@@ -5,7 +5,7 @@ module PushType
 
     def initialize(*args)
       super
-      raise ArgumentError, "Relation field names must end with suffix `_id` or `ids`." unless relation_name
+      raise ArgumentError, "Relation field names must end with suffix `_id` or `_ids`." unless relation_name
     end
 
     def json_primitive
@@ -33,7 +33,7 @@ module PushType
     end
 
     def relation_class
-      (@opts[:to] || relation_name.singularize).classify.constantize
+      (@opts[:to] || relation_name.singularize).to_s.classify.constantize
     end
 
     def relation_root

data/app/fields/push_type/repeater_field.rb

@@ -6,22 +6,31 @@ module PushType
 
     def initialize(*args)
       super
-      validate_field_type!
+      raise ArgumentError, "Invalid field type. `#{ @opts[:repeats] }` cannot be used in #{ self.class.name }." if [:tag_list].include?(@opts[:repeats])
+      _key, _opts = structure_json_key, @opts
+      structure_class.class_eval do
+        field _key, _opts[:repeats], _opts.except(:css_class, :repeats).merge(multiple: false)
+        define_method(:f) { fields[_key] }
+      end
     end
 
     def value
       return if json_value.blank?
-      json_value.map do |j|
-        generate_field('_f' => j).value
-      end
+      rows.map(&:_f)
     end
 
     def template
       'repeater'
     end
 
-    def field
-      @field ||= generate_field
+    def rows
+      Array(json_value).map do |j|
+        structure_class.new(field_store: { structure_json_key => j }.as_json)
+      end
+    end
+
+    def structure
+      @structure ||= structure_class.new
     end
 
     private
@@ -30,27 +39,16 @@ module PushType
       super.except(:template, :form_helper)
     end
 
-    def generate_field(json = {})
-      field_type.new :_f, PushType::Structure.new(field_store: json), @opts.except(:css_class).merge(multiple: false)
+    def structure_class
+      @structure_class ||= PushType::Structure.clone
     end
 
-    def field_type
-      begin
-        "push_type/#{ @opts[:repeats] }_field".camelize.constantize
-      rescue NameError
-        "#{ @opts[:repeats] }_field".camelize.constantize
+    def structure_json_key
+      case @opts[:repeats]
+        when :relation, :node, :taxonomy, :asset then :_f_id
+        else :_f
       end
     end
 
-    def validate_field_type!
-      unless field_type_whitelist.include?(@opts[:repeats])
-        raise ArgumentError, "Invalid field type. `#{ @opts[:repeats] }` cannot be used in #{ self.class.name }."
-      end
-    end
-
-    def field_type_whitelist
-      [:number, :string, :text]
-    end
-
   end
 end

data/app/fields/push_type/tag_list_field.rb

@@ -24,6 +24,9 @@ module PushType
     on_class do |klass, field_name, field_class|
       klass.class_eval do
 
+        # Break unless we are working on an ActiveRecord klass
+        break unless respond_to?(:scope)
+
         # Dynamically define standard scope .with_all_`field_name`
         # Returns ActiveRecord::Relation
         #

data/lib/push_type/field_type.rb

@@ -28,7 +28,7 @@ module PushType
     def initialize(name, model, opts = {})
       @name     = name
       @model    = model
-      @opts     = [defaults, self.class.options, opts].compact.inject(&:merge)
+      @opts     = [defaults, self.class.options, opts].compact.inject(&:deep_merge)
     end
 
     def kind

data/lib/push_type/primitives/object_type.rb

@@ -1,6 +1,13 @@
 module PushType
   module Primitives
     class ObjectType < Base
+
+      def to_json
+        unless value.blank? or value.values.all?(&:blank?)
+          super
+        end
+      end
+
     end
   end
 end

data/lib/push_type/version.rb

@@ -1,3 +1,3 @@
 module PushType
-  VERSION = '0.6.0.beta.1'
+  VERSION = '0.6.0.beta.2'
 end

data/test/dummy/config/initializers/push_type.rb

@@ -50,6 +50,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = '00043bc391450eed15067f573d180cdbe11701d4ac2071846afedf63a0b0ff97'
+  # config.dragonfly_secret = '95ec48e6fde12daa65a9093d7c6cd8a626019001f388ed0d407154d78ac44f30'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: f1b64e4e941325944b2519b10024c2b271e7237e0938afb8aad157c8701a1ef3f899fd1026297f82fad973d6c4f070ee56c6b4d54b80cbd01f98577a254dd7da
+  secret_key_base: 992655c5cb254e30f6a08279cae78c7bb529da42b7f3f598f2ae57e3809c19e934351882962572232d8d2bc801734f7a269b042b04be4263d2b67f1a48406924
 
 test:
-  secret_key_base: fef760fdb11a957790330541b9117b84f83b8355d4795cecc6e28fe4877abf837eb20a317380d203880d4e0e439bfa064d0dede3697edd70feaa1304917e65ab
+  secret_key_base: 1962b2ff958bc3e4bf7281cafde40cb1e34e1419dc68293ac323e874027d1600bb6538bb74ac7f34856ede2702dfe57f5d9eb6c96b00735606fd7b3ba5a9fa1d
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151015181659) do
+ActiveRecord::Schema.define(version: 20151102165843) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"