push_type_core 0.5.0.alpha.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb3e621dc6b8ce662cccabe0ba874589b55f29e1
-  data.tar.gz: 6ab6388e7e490ba3a2541b357e2568114386fbf3
+  metadata.gz: 6aa55009b4f8a6c03b6fb102406df0571d67b025
+  data.tar.gz: 84db15a256012cfade4359e65df44e3ad25c6e0b
 SHA512:
-  metadata.gz: 620dc4421f678cf7bfa6f920e226388a3720c11e3fd22cb6377b5d699218afeb40cb58d2d6df9befda44d8388cde9ad3390504591d8c30407904a3167f31c628
-  data.tar.gz: 936eac7a240842849a9fa5de47477357ad54e8f415c956a1fba08066ca8153f1e59fdea341d12ebe12bf38ef93dd691253a900fd2c6387fbe0a5dd9dfe8c4f4c
+  metadata.gz: 23d987c95bedbc81a6391c0204cb1d6b499b8dc98ad70d291f0a8f348423264b0cf76a030a6e233d0b11644363726ac1a5f307203354ab3fa895bff600408225
+  data.tar.gz: 1bd32879b186951bbf24ac36320fdbd101b75547040a7e9f30e0fdba476cc12e83dc2941f6741d000a6e7ae0d71e0db8e6ff69197b5bc1757e620c897cd4f5d7

data/app/fields/push_type/asset_field.rb

@@ -9,10 +9,14 @@ module PushType
       "#{ name }-asset-modal"
     end
 
+    def relation_class
+      PushType::Asset
+    end
+
     initialized_on_node do |object, field|
       object.class_eval do
         define_method field.name.to_sym do
-          PushType::Asset.find send(field.json_key) if send(field.json_key).present?
+          field.relation_class.not_trash.find send(field.json_key) if send(field.json_key).present?
         end
       end
     end

data/app/fields/push_type/markdown_field.rb

@@ -13,10 +13,6 @@ module PushType
       underline:            true
     }
 
-    def form_helper
-      @opts[:form_helper] || :text_area
-    end
-
     def markdown
       @markdown ||= Redcarpet::Markdown.new(renderer, @opts[:extensions])
     end
@@ -29,7 +25,8 @@ module PushType
       object.presenter_class.class_eval do
 
         define_method field.name.to_sym do
-          fields[field.json_key].markdown.render super()
+          raw = super()
+          fields[field.json_key].markdown.render raw unless raw.nil?
         end
 
       end

data/app/fields/push_type/matrix_field.rb

@@ -3,7 +3,7 @@ module PushType
 
     include PushType::Fields::Arrays
 
-    options template: :matrix, mapping: [:key, :value]
+    options template: 'matrix', mapping: [:key, :value]
 
     def param
       { json_key => mapping.keys }

data/app/fields/push_type/node_field.rb

@@ -5,15 +5,22 @@ module PushType
 
     options template: 'relation', field_options: {}, root: '/'
 
+    def relation_class
+      super
+    rescue NameError
+      PushType::Node
+    end
+
     def relation_root
-      root = @opts[:root] == '/' ? PushType::Node : PushType::Node.find_by_path(@opts[:root].split('/'))
+      root = relation_class.not_trash
+      root = root.find_by_path(@opts[:root].split('/')) unless @opts[:root] == '/'
       root or raise "Cannot find root node at path '#{ @opts[:root] }'"
     end   
 
     initialized_on_node do |object, field|
       object.class_eval do
         define_method field.name.to_sym do
-          field.relation_class.find send(field.json_key) if send(field.json_key).present?
+          field.relation_class.not_trash.find send(field.json_key) if send(field.json_key).present?
         end
       end
     end

data/app/fields/push_type/repeater_field.rb

@@ -3,7 +3,7 @@ module PushType
 
     include PushType::Fields::Arrays
 
-    options template: :repeater
+    options template: 'repeater'
 
     def to_json(val)
       super.reject(&:blank?) if val.present?

data/app/fields/push_type/taxonomy_field.rb

@@ -5,8 +5,10 @@ module PushType
 
     options template: 'relation', field_options: {}
 
-    def relation_option
-      @opts[:taxonomy_class]
+    def relation_class
+      super
+    rescue NameError
+      PushType::Taxonomy
     end
 
     initialized_on_node do |object, field|

data/lib/push_type/fields/relations.rb

@@ -7,12 +7,12 @@ module PushType
         (name.singularize + suffix).to_sym
       end
 
-      def relation_option
-        @opts[:relation_class]
+      def relation_class
+        (@opts[:class] || name).to_s.classify.constantize
       end
 
       def relation_root
-        (relation_option || name.singularize).to_s.classify.constantize
+        relation_class
       end
 
       def relation_tree

data/lib/push_type/version.rb

@@ -1,3 +1,3 @@
 module PushType
-  VERSION = '0.5.0.alpha.5'
+  VERSION = '0.5.0'
 end

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

@@ -33,6 +33,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = '83a5792fddd87faa448f1d6c1c82929f94672e15ac409d8ca86f2831d0afe0c9'
+  # config.dragonfly_secret = 'ecd8c099d97873bfcba21a3f63d298e86a7b4342be8493eb56b291d0ca46b187'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 3e76757bba6f2b80ef66fdc027eaeced7d1fd31949061a510701a7180f1abbc94671d0d7fec047c6d98c3af15afa5e43831601a3ee567ccde83e716f3e0294e2
+  secret_key_base: b88deb276072e733b6a6b83a5d5362b6e21a3b0d083b025c5317c5f5a52c037bf58548da93d789c587f33d73484df50681fd5389ba378a9c3a2431cc1a01ad7f
 
 test:
-  secret_key_base: 13ff88a99d182c14e823d02cac1b0ca49fa0008e05d73dcdd3186480d81adefd1421ed548456d76e0f0511eaba9ce0d161976737c3405223eec818ba43697864
+  secret_key_base: 2bdc9c611035f1a8d28c68f1fccfc3a9917277fb2785620953a8d30c8665e88a0f5fd52195a4e815f63687233bc57fa358aad0a71d8531d64f252b44841d25c8
 
 # 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: 20150601132822) do
+ActiveRecord::Schema.define(version: 20150716155023) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"