push_type_core 0.6.0 → 0.7.0.beta.1

data/test/fields/push_type/boolean_field_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+module PushType
+  class BooleanFieldTest < ActiveSupport::TestCase
+
+    class TestPage < PushType::Node
+      field :foo, :boolean
+    end
+
+    let(:node)  { TestPage.create FactoryGirl.attributes_for(:node, foo: '1') }
+    let(:field) { node.fields[:foo] }
+    
+    it { field.json_primitive.must_equal :boolean }
+    it { field.form_helper.must_equal :check_box }
+    it { field.json_value.must_equal true }
+    it { field.value.must_equal true }
+
+    it { node.foo.must_equal true }
+
+  end
+end

data/test/fields/push_type/matrix_field_test.rb

@@ -4,13 +4,14 @@ module PushType
   class MatrixFieldTest < ActiveSupport::TestCase
 
     class TestPage < PushType::Node
-      field :foo, :matrix do
+      field :foo, :matrix, grid: false do
         field :key, :string
         field :val, :text
       end
+      field :bar, :matrix, class: :location
     end
 
-    let(:node)  { TestPage.create FactoryGirl.attributes_for(:node, foo: val) }
+    let(:node)  { TestPage.create FactoryGirl.attributes_for(:node, foo: val, bar: [1]) }
     let(:val)   { [{ key: 'a', val: 'b' }, { key: 'x', val: 'y' }] }
     let(:field) { node.fields[:foo] }
 
@@ -23,5 +24,10 @@ module PushType
     it { field.value[0].key.must_equal 'a' }
     it { field.value[1].val.must_equal 'y' }
 
+    it { node.bar.first.must_be_instance_of Location }
+    it { node.bar.first.class.ancestors.must_include PushType::Structure }
+    it { node.fields[:bar].grid?.must_equal true }
+    it { node.fields[:foo].grid?.must_equal false }
+
   end
 end

data/test/fields/push_type/relation_field_test.rb

@@ -6,6 +6,8 @@ module PushType
     class TestPage < PushType::Node
       field :page_id, :relation
       field :bar_ids, :relation, to: 'push_type/node', multiple: true
+      field :baz_ids, :relation, to: :page, scope: -> { order(created_at: :desc).all }
+      field :qux_ids, :relation, to: :page, scope: -> { all.hash_tree }
     end
 
     before do
@@ -17,6 +19,8 @@ module PushType
     let(:rel)   { @pages.first }
     let(:foo)   { node.fields[:page_id] }
     let(:bar)   { node.fields[:bar_ids] }
+    let(:baz)   { node.fields[:baz_ids] }
+    let(:qux)   { node.fields[:qux_ids] }
 
     it { foo.json_primitive.must_equal :string }
     it { foo.template.must_equal 'relation' }
@@ -29,6 +33,7 @@ module PushType
     it { foo.choices.map { |c| c[:value] }.must_include rel.id }
     it { foo.relation_name.must_equal 'page' }
     it { foo.relation_class.must_equal Page }
+    it { foo.relation_items.must_be_kind_of ActiveRecord::Relation }
 
     it { bar.json_primitive.must_equal :array }
     it { bar.must_be :multiple? }
@@ -38,6 +43,13 @@ module PushType
     it { bar.json_value.must_equal @bars.map(&:id) }
     it { bar.value.must_equal @bars.map(&:id) }
     it { bar.choices.size.must_equal 7 }
+    it { bar.relation_items.must_be_kind_of ActiveRecord::Relation }
+
+    it { baz.relation_class.must_equal Page }
+    it { baz.choices.size.must_equal 4 }
+    it { baz.relation_items.must_be_kind_of ActiveRecord::Relation }
+    it { qux.choices.size.must_equal 4 }
+    it { qux.relation_items.must_be_kind_of Hash }
 
     it { node.page_id.must_equal rel.id }
     it { node.page.must_equal rel }

data/test/lib/push_type/core_exts_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+module PushType
+  class CoreExtTest < ActiveSupport::TestCase
+
+    describe 'to_bool' do
+      # Strings
+      it { ''.to_bool.must_equal false }
+      it { '0'.to_bool.must_equal false }
+      it { 'no'.to_bool.must_equal false }
+      it { 'false'.to_bool.must_equal false }
+      it { '1'.to_bool.must_equal true }
+      it { 'anything else'.to_bool.must_equal true }
+
+      # Fixnums
+      it { 0.to_bool.must_equal false }
+      it { 1.to_bool.must_equal true }
+      it { 1234.to_bool.must_equal true }
+
+      # Booleans
+      it { false.to_i.must_equal 0 }
+      it { false.to_bool.must_equal false }
+      it { true.to_i.must_equal 1 }
+      it { true.to_bool.must_equal true }
+
+      # Nils
+      it { nil.to_bool.must_equal false }
+    end
+    
+  end
+end

data/test/lib/push_type/primitives_test.rb

@@ -18,6 +18,19 @@ module PushType
       it { primitive.to_json(val).must_equal ['a', 'b', 'c'] }
     end
 
+    describe 'BooleanType' do
+      let(:primitive) { PushType::Primitives::BooleanType }
+
+      it { primitive.to_json(nil).must_equal nil }
+      it { primitive.to_json(false).must_equal false }
+      it { primitive.to_json(0).must_equal false }
+      it { primitive.to_json('').must_equal false }
+      it { primitive.to_json('false').must_equal false }
+      it { primitive.to_json(true).must_equal true }
+      it { primitive.to_json(1).must_equal true }
+      it { primitive.to_json('true').must_equal true }
+    end
+
     describe 'NumberType' do
       let(:primitive) { PushType::Primitives::NumberType }
       let(:val)       { '123.45' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: push_type_core
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0.beta.1
 platform: ruby
 authors:
 - Aaron Russell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -155,10 +155,10 @@ files:
 - app/controllers/nodes_front_end_controller.rb
 - app/controllers/taxonomies_front_end_controller.rb
 - app/fields/push_type/asset_field.rb
+- app/fields/push_type/boolean_field.rb
 - app/fields/push_type/date_field.rb
 - app/fields/push_type/markdown_field.rb
 - app/fields/push_type/matrix_field.rb
-- app/fields/push_type/node_field.rb
 - app/fields/push_type/number_field.rb
 - app/fields/push_type/relation_field.rb
 - app/fields/push_type/repeater_field.rb
@@ -166,7 +166,6 @@ files:
 - app/fields/push_type/string_field.rb
 - app/fields/push_type/structure_field.rb
 - app/fields/push_type/tag_list_field.rb
-- app/fields/push_type/taxonomy_field.rb
 - app/fields/push_type/text_field.rb
 - app/fields/push_type/time_field.rb
 - app/helpers/push_type/application_helper.rb
@@ -219,6 +218,7 @@ files:
 - lib/push_type/config.rb
 - lib/push_type/core.rb
 - lib/push_type/core/engine.rb
+- lib/push_type/core_ext/to_bool.rb
 - lib/push_type/field_type.rb
 - lib/push_type/menu_builder.rb
 - lib/push_type/menu_builder/dsl/menu.rb
@@ -230,6 +230,7 @@ files:
 - lib/push_type/presenter.rb
 - lib/push_type/primitives/array_type.rb
 - lib/push_type/primitives/base.rb
+- lib/push_type/primitives/boolean_type.rb
 - lib/push_type/primitives/number_type.rb
 - lib/push_type/primitives/object_type.rb
 - lib/push_type/primitives/string_type.rb
@@ -279,13 +280,13 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20151108150752_create_push_type_users.push_type.rb
-- test/dummy/db/migrate/20151108150753_create_push_type_nodes.push_type.rb
-- test/dummy/db/migrate/20151108150754_create_push_type_node_hierarchies.push_type.rb
-- test/dummy/db/migrate/20151108150755_create_push_type_assets.push_type.rb
-- test/dummy/db/migrate/20151108150756_create_push_type_taxonomies.push_type.rb
-- test/dummy/db/migrate/20151108150757_create_push_type_taxonomy_hierarchies.push_type.rb
-- test/dummy/db/migrate/20151108150758_add_field_store_default_values.push_type.rb
+- test/dummy/db/migrate/20160108132348_create_push_type_users.push_type.rb
+- test/dummy/db/migrate/20160108132349_create_push_type_nodes.push_type.rb
+- test/dummy/db/migrate/20160108132350_create_push_type_node_hierarchies.push_type.rb
+- test/dummy/db/migrate/20160108132351_create_push_type_assets.push_type.rb
+- test/dummy/db/migrate/20160108132352_create_push_type_taxonomies.push_type.rb
+- test/dummy/db/migrate/20160108132353_create_push_type_taxonomy_hierarchies.push_type.rb
+- test/dummy/db/migrate/20160108132354_add_field_store_default_values.push_type.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/log/test.log
@@ -297,18 +298,18 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/0ANSDcZJu9gPyqtYPIW729qm1kriQ29Vn9LU8T2SGQU.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/3T6ioyhwSsEzte_a9viHBvfmuKgORQ019srIEoUYkVs.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/5Lly_CA8DZvPhQV2jDQx-Y6P_y3Ygra9t5jfSlGhHDA.cache
-- test/dummy/tmp/cache/assets/test/sprockets/v3.0/ICYfNnwyQOM4ypAd7cL9ig1weq-ynnC7JO__sNCZo98.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/8FGH_ku24FOYEa6ACm3vyk_rZwODpSzv3MjZU4irm7M.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/IYzwMwq7DWWSuojH6oXsrP__pcD7O8TQieMFSzQiwnc.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/OI6uxGcnsKavdWTtwDAasU3wPx8QXhzBgV0X2n1KjMQ.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/_d65qW7wxRtKVSYpmfSenECz5QUWVI9pppUgV7TA1Rk.cache
-- test/dummy/tmp/cache/assets/test/sprockets/v3.0/tlOpTnaa_t4XAbGrJuMXP6N7RwkbFqu0Q3NnnTJGR_o.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/o8jETQIOAUNl34ED3ZTGdlVAlYRSl8zt6mfx4Wr1_Hs.cache
 - test/dummy/tmp/generators/app/models/category.rb
 - test/dummy/tmp/generators/app/views/taxonomies/category.html.erb
 - test/fields/push_type/asset_field_test.rb
+- test/fields/push_type/boolean_field_test.rb
 - test/fields/push_type/date_field_test.rb
 - test/fields/push_type/markdown_field_test.rb
 - test/fields/push_type/matrix_field_test.rb
-- test/fields/push_type/node_field_test.rb
 - test/fields/push_type/number_field_test.rb
 - test/fields/push_type/relation_field_test.rb
 - test/fields/push_type/repeater_field_test.rb
@@ -316,7 +317,6 @@ files:
 - test/fields/push_type/string_field_test.rb
 - test/fields/push_type/structure_field_test.rb
 - test/fields/push_type/tag_list_field_test.rb
-- test/fields/push_type/taxonomy_field_test.rb
 - test/fields/push_type/text_field_test.rb
 - test/fields/push_type/time_field_test.rb
 - test/files/audio.m3u
@@ -329,6 +329,7 @@ files:
 - test/lib/generators/push_type/presenter_generator_test.rb
 - test/lib/generators/push_type/structure_generator_test.rb
 - test/lib/generators/push_type/taxonomy_generator_test.rb
+- test/lib/push_type/core_exts_test.rb
 - test/lib/push_type/core_test.rb
 - test/lib/push_type/field_type_test.rb
 - test/lib/push_type/menu_builder/menu_dsl_test.rb
@@ -366,9 +367,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.2
@@ -411,13 +412,13 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
-- test/dummy/db/migrate/20151108150752_create_push_type_users.push_type.rb
-- test/dummy/db/migrate/20151108150753_create_push_type_nodes.push_type.rb
-- test/dummy/db/migrate/20151108150754_create_push_type_node_hierarchies.push_type.rb
-- test/dummy/db/migrate/20151108150755_create_push_type_assets.push_type.rb
-- test/dummy/db/migrate/20151108150756_create_push_type_taxonomies.push_type.rb
-- test/dummy/db/migrate/20151108150757_create_push_type_taxonomy_hierarchies.push_type.rb
-- test/dummy/db/migrate/20151108150758_add_field_store_default_values.push_type.rb
+- test/dummy/db/migrate/20160108132348_create_push_type_users.push_type.rb
+- test/dummy/db/migrate/20160108132349_create_push_type_nodes.push_type.rb
+- test/dummy/db/migrate/20160108132350_create_push_type_node_hierarchies.push_type.rb
+- test/dummy/db/migrate/20160108132351_create_push_type_assets.push_type.rb
+- test/dummy/db/migrate/20160108132352_create_push_type_taxonomies.push_type.rb
+- test/dummy/db/migrate/20160108132353_create_push_type_taxonomy_hierarchies.push_type.rb
+- test/dummy/db/migrate/20160108132354_add_field_store_default_values.push_type.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/log/test.log
@@ -431,18 +432,18 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/0ANSDcZJu9gPyqtYPIW729qm1kriQ29Vn9LU8T2SGQU.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/3T6ioyhwSsEzte_a9viHBvfmuKgORQ019srIEoUYkVs.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/5Lly_CA8DZvPhQV2jDQx-Y6P_y3Ygra9t5jfSlGhHDA.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/8FGH_ku24FOYEa6ACm3vyk_rZwODpSzv3MjZU4irm7M.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/_d65qW7wxRtKVSYpmfSenECz5QUWVI9pppUgV7TA1Rk.cache
-- test/dummy/tmp/cache/assets/test/sprockets/v3.0/ICYfNnwyQOM4ypAd7cL9ig1weq-ynnC7JO__sNCZo98.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/IYzwMwq7DWWSuojH6oXsrP__pcD7O8TQieMFSzQiwnc.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/o8jETQIOAUNl34ED3ZTGdlVAlYRSl8zt6mfx4Wr1_Hs.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/OI6uxGcnsKavdWTtwDAasU3wPx8QXhzBgV0X2n1KjMQ.cache
-- test/dummy/tmp/cache/assets/test/sprockets/v3.0/tlOpTnaa_t4XAbGrJuMXP6N7RwkbFqu0Q3NnnTJGR_o.cache
 - test/dummy/tmp/generators/app/models/category.rb
 - test/dummy/tmp/generators/app/views/taxonomies/category.html.erb
 - test/fields/push_type/asset_field_test.rb
+- test/fields/push_type/boolean_field_test.rb
 - test/fields/push_type/date_field_test.rb
 - test/fields/push_type/markdown_field_test.rb
 - test/fields/push_type/matrix_field_test.rb
-- test/fields/push_type/node_field_test.rb
 - test/fields/push_type/number_field_test.rb
 - test/fields/push_type/relation_field_test.rb
 - test/fields/push_type/repeater_field_test.rb
@@ -450,7 +451,6 @@ test_files:
 - test/fields/push_type/string_field_test.rb
 - test/fields/push_type/structure_field_test.rb
 - test/fields/push_type/tag_list_field_test.rb
-- test/fields/push_type/taxonomy_field_test.rb
 - test/fields/push_type/text_field_test.rb
 - test/fields/push_type/time_field_test.rb
 - test/files/audio.m3u
@@ -463,6 +463,7 @@ test_files:
 - test/lib/generators/push_type/presenter_generator_test.rb
 - test/lib/generators/push_type/structure_generator_test.rb
 - test/lib/generators/push_type/taxonomy_generator_test.rb
+- test/lib/push_type/core_exts_test.rb
 - test/lib/push_type/core_test.rb
 - test/lib/push_type/field_type_test.rb
 - test/lib/push_type/menu_builder/menu_dsl_test.rb

data/app/fields/push_type/node_field.rb

@@ -1,27 +0,0 @@
-module PushType
-  class NodeField < RelationField
-
-    options template: 'relation', root: '/'
-
-    def relation_class
-      super
-    rescue NameError
-      PushType::Node
-    end
-
-    def relation_root
-      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
-
-    on_instance do |object, field|
-      object.class_eval do
-        define_method(field.relation_name.to_sym) do
-          field.relation_class.not_trash.find field.json_value unless field.json_value.blank?
-        end unless method_defined?(field.relation_name.to_sym)
-      end
-    end
-
-  end
-end

data/app/fields/push_type/taxonomy_field.rb

@@ -1,21 +0,0 @@
-module PushType
-  class TaxonomyField < RelationField
-
-    options template: 'relation'
-
-    def relation_class
-      super
-    rescue NameError
-      PushType::Taxonomy
-    end
-
-    on_instance do |object, field|
-      object.class_eval do
-        define_method(field.relation_name.to_sym) do
-          field.relation_class.find field.json_value unless field.json_value.blank?
-        end unless method_defined?(field.relation_name.to_sym)
-      end
-    end
-
-  end
-end

data/test/fields/push_type/node_field_test.rb

@@ -1,48 +0,0 @@
-require 'test_helper'
-
-module PushType
-  class NodeFieldTest < ActiveSupport::TestCase
-
-    class TestPage < PushType::Node
-      field :page_id, :node
-      field :bar_ids, :node, multiple: true, to: 'page', root: 'foo-bar'
-    end
-
-    before do
-      root    = Page.create FactoryGirl.attributes_for(:node, slug: 'foo-bar')
-      @pages  = 4.times.map { Page.create FactoryGirl.attributes_for(:node) }
-      @bars   = 2.times.map { Page.create FactoryGirl.attributes_for(:node, parent_id: root.id) }
-    end
-
-    let(:node)  { TestPage.create FactoryGirl.attributes_for(:node, page_id: rel.id, bar_ids: @bars.map(&:id)) }
-    let(:rel)   { @pages.first }
-    let(:foo)   { node.fields[:page_id] }
-    let(:bar)   { node.fields[:bar_ids] }
-
-    it { foo.json_primitive.must_equal :string }
-    it { foo.template.must_equal 'relation' }
-    it { foo.wont_be :multiple? }
-    it { foo.label.must_equal 'Page' }
-    it { foo.html_options.keys.must_include :multiple }
-    it { foo.json_value.must_equal rel.id }
-    it { foo.value.must_equal rel.id }
-    it { foo.choices.size.must_equal 7 }
-    it { foo.choices.map { |c| c[:value] }.must_include rel.id }
-    it { foo.relation_name.must_equal 'page' }
-    it { foo.relation_class.must_equal Page }
-
-    it { bar.json_primitive.must_equal :array }
-    it { bar.must_be :multiple? }
-    it { bar.label.must_equal 'Bars' }
-    it { bar.json_value.must_equal @bars.map(&:id) }
-    it { bar.value.must_equal @bars.map(&:id) }
-    it { bar.choices.size.must_equal 3 }
-    it { bar.relation_name.must_equal 'bars' }
-
-    it { node.page_id.must_equal rel.id }
-    it { node.page.must_equal rel }
-    it { node.bar_ids.must_equal @bars.map(&:id) }
-    it { node.bars.sort.must_equal @bars.sort }
-
-  end
-end