push_type_core 0.5.3 → 0.6.0.beta.1

data/app/models/concerns/push_type/presentable.rb

@@ -13,13 +13,13 @@ module PushType
     module ClassMethods
 
       def presenter_class_name
-        "#{ name }Presenter"
+        "#{ self.name.demodulize }Presenter"
       end
 
       def presenter_class
-        Object.const_get presenter_class_name
+        self.parent.const_get presenter_class_name
       rescue NameError
-        Object.const_set presenter_class_name, Class.new(PushType::Presenter)
+        self.parent.const_set presenter_class_name, Class.new(PushType::Presenter)
       end
 
     end

data/app/models/concerns/push_type/templatable.rb

@@ -13,7 +13,7 @@ module PushType
     module ClassMethods
 
       def template(name, opts = {})
-        @template_name = name
+        @template_name = name.to_s
         @template_opts = opts
       end
 

data/app/models/push_type/structure.rb

@@ -0,0 +1,27 @@
+module PushType
+  class Structure
+
+    attr_accessor :field_store
+
+    include ActiveModel::Model
+    include ActiveRecord::AttributeAssignment
+    include ActiveRecord::Store
+    
+    extend ActiveModel::Callbacks
+    define_model_callbacks :initialize, only: :after
+
+    include PushType::Customizable
+
+    def self.name
+      'PushType::Structure'
+    end
+
+    def initialize(*args)
+      run_callbacks :initialize do
+        @field_store ||= {}
+        super
+      end
+    end
+
+  end
+end

data/lib/push_type/field_type.rb

@@ -1,16 +1,101 @@
-require 'push_type/fields/class_methods'
-require 'push_type/fields/base'
-require 'push_type/fields/ui'
-require 'push_type/fields/arrays'
-require 'push_type/fields/relations'
+require 'push_type/primitives/base'
+require 'push_type/primitives/string_type'
+require 'push_type/primitives/number_type'
+require 'push_type/primitives/array_type'
+require 'push_type/primitives/object_type'
 
 module PushType
   class FieldType
 
-    extend PushType::Fields::ClassMethods
+    class << self
+      attr_reader :def_block, :init_block
 
-    include PushType::Fields::Base
-    include PushType::Fields::Ui
+      def options(opts = {})
+        @options ||= opts
+      end
+
+      def on_class(&block)
+        @def_block = block
+      end
+
+      def on_instance(&block)
+        @init_block = block
+      end
+    end
+
+    attr_reader :name, :model
+
+    def initialize(name, model, opts = {})
+      @name     = name
+      @model    = model
+      @opts     = [defaults, self.class.options, opts].compact.inject(&:merge)
+    end
+
+    def kind
+      self.class.name.demodulize.underscore.gsub(/_(field|type)$/, '').to_sym
+    end
+
+    def primitive
+      begin
+        "push_type/primitives/#{ json_primitive }_type".camelize.constantize
+      rescue NameError
+        "#{ json_primitive }_type".camelize.constantize
+      end
+    end
+
+    def json_value
+      model.field_store[name.to_s]
+    end
+
+    def value
+      json_value
+    end
+
+    def json_primitive
+      @opts[:json_primitive]
+    end
+
+    def css_class
+      @opts[:css_class]
+    end
+
+    def template
+      @opts[:template]
+    end
+
+    def label
+      @opts[:label]
+    end
+
+    def form_helper
+      @opts[:form_helper]
+    end
+
+    def html_options
+      @opts[:html_options]
+    end
+
+    def field_options
+      @opts[:field_options]
+    end
+
+    def multiple?
+      @opts[:multiple]
+    end
+
+    private
+
+    def defaults
+      {
+        json_primitive: :string,
+        template:       'default',
+        label:          name.to_s.humanize,
+        form_helper:    :text_field,
+        html_options:   {},
+        field_options:  {},
+        multiple:       false
+      }
+    end
 
   end
 end

data/lib/push_type/primitives/array_type.rb

@@ -0,0 +1,14 @@
+module PushType
+  module Primitives
+    class ArrayType < Base
+
+      def to_json
+        unless value.blank?
+          Array(value).reject(&:blank?)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/push_type/primitives/base.rb

@@ -0,0 +1,21 @@
+module PushType
+  module Primitives
+    class Base
+
+      def self.to_json(val)
+        new(val).to_json
+      end
+
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def to_json
+        value.as_json
+      end
+
+    end
+  end
+end

data/lib/push_type/primitives/number_type.rb

@@ -0,0 +1,14 @@
+module PushType
+  module Primitives
+    class NumberType < Base
+
+      def to_json
+        unless value.blank? || value.to_s !~ /^[\+\-]?\d+/
+          (f = value.to_f) && (f % 1.0 == 0) ? f.to_i : f
+        end
+      end
+
+    end
+  end
+end
+

data/lib/push_type/primitives/object_type.rb

@@ -0,0 +1,7 @@
+module PushType
+  module Primitives
+    class ObjectType < Base
+    end
+  end
+end
+

data/lib/push_type/primitives/string_type.rb

@@ -0,0 +1,12 @@
+module PushType
+  module Primitives
+    class StringType < Base
+
+      def to_json
+        value.to_s unless value.blank?
+      end
+
+    end
+  end
+end
+

data/lib/push_type/testing/factories.rb

@@ -16,7 +16,7 @@ FactoryGirl.define do
 
     factory :published_node do
       status 'published'
-    end    
+    end
   end
 
   sequence :email do |n|

data/lib/push_type/testing/setup.rb

@@ -6,6 +6,8 @@ require 'database_cleaner'
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
+Rails.backtrace_cleaner.remove_silencers!
+
 DatabaseCleaner.strategy = :transaction
 DatabaseCleaner.clean_with :truncation
 Dragonfly.app.use_datastore :memory

data/lib/push_type/version.rb

@@ -1,3 +1,3 @@
 module PushType
-  VERSION = '0.5.3'
+  VERSION = '0.6.0.beta.1'
 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 = 'b9476f7fd2c545f81e0bc28402dd38a0e2de03942eedf493548c37dc8aab841a'
+  # config.dragonfly_secret = '00043bc391450eed15067f573d180cdbe11701d4ac2071846afedf63a0b0ff97'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 043e8f325af09cd6a8beea1d081427b966f2745bb082b1b5fad84ee8af59dc0bd1315377697ee686a4ea3eabdcd875ba266ec59c30a3da3f66c14ba9d88f81d0
+  secret_key_base: f1b64e4e941325944b2519b10024c2b271e7237e0938afb8aad157c8701a1ef3f899fd1026297f82fad973d6c4f070ee56c6b4d54b80cbd01f98577a254dd7da
 
 test:
-  secret_key_base: 48dfc0ccdd4da998c1dc305bf1adb18f358d5507483f30633baff6f3ebd6cb5b6949180dcb01a1e8582984e21d52bfb78f23250cde425bdc2fa6a9b4be10af48
+  secret_key_base: fef760fdb11a957790330541b9117b84f83b8355d4795cecc6e28fe4877abf837eb20a317380d203880d4e0e439bfa064d0dede3697edd70feaa1304917e65ab
 
 # 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: 20150928114665) do
+ActiveRecord::Schema.define(version: 20151015181659) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"