push_type_core 0.6.0.beta.2 → 0.6.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 695f0cf51a3d8408ce92094dfe92610f6e079546
-  data.tar.gz: 727b6d4d5c39f6c0b3196362a113823e0a416fa5
+  metadata.gz: 492da763c6d337fda6817a83d64cd7668c424b01
+  data.tar.gz: 56209c8f5ba1d6927979b940cd3cc96f6b1e3490
 SHA512:
-  metadata.gz: 374753265c5c609f1602a81d7f0138e0c47a96ace93124ba45bfda9d7c02772b4a29bbf760c12e8158e39d36d1da5903330949a987f74ccd93e5c63b63f2a9ac
-  data.tar.gz: 994a863f1bdb86cf7189ddb78f89dc10df1714fc66a4be0938b9bda6a6a088e88c15ee9613a84d2434af8824a4ec7e06fc18e133733808b006c868f27b3c24c2
+  metadata.gz: 3d1ad349bc2a207036935224cd0bb464cea27b2efc2eb13bb0d054fb5113bf818ce49edf205f8bfe9083ed9a90834a391a8af98fc58720b86828bb498ff5f911
+  data.tar.gz: 52f683eab84ebe8e5790a4a2c1e55c93a3befda8688bed83d4d02f50a23e279fb700afd59016d1d2b9353f23f9e2c841dd5ced388c02d9205f3915e1ce9cbf76

data/app/fields/push_type/matrix_field.rb

@@ -31,7 +31,9 @@ module PushType
     private
 
     def structure_class
-      @structure_class ||= PushType::Structure.clone
+      @structure_class ||= Class.new PushType::Structure do
+        define_singleton_method(:name) { "PushType::Structure" }
+      end
     end
 
   end

data/app/fields/push_type/structure_field.rb

@@ -21,7 +21,13 @@ module PushType
     private
 
     def structure_class
-      @structure_class ||= PushType::Structure.clone
+      @structure_class ||= begin
+        (@opts[:class] || name).to_s.classify.constantize
+      rescue NameError
+        Class.new PushType::Structure do
+          define_singleton_method(:name) { "PushType::Structure" }
+        end
+      end
     end
 
     def structure

data/app/models/push_type/structure.rb

@@ -11,10 +11,7 @@ module PushType
     define_model_callbacks :initialize, only: :after
 
     include PushType::Customizable
-
-    def self.name
-      'PushType::Structure'
-    end
+    include PushType::Presentable
 
     def initialize(*args)
       run_callbacks :initialize do

data/lib/generators/push_type/structure/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Generates a model that inherits from PushType::Structure
+
+Example:
+    rails generate push_type:structure location street_address:string postcode:string
+
+    This will create:
+        app/models/location.rb

data/lib/generators/push_type/structure/structure_generator.rb

@@ -0,0 +1,18 @@
+module PushType
+  class StructureGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+    argument :attributes, type: :array, default: [], banner: "field:type field:type"
+
+    def create_model
+      template 'structure.rb', "app/models/#{ file_name }.rb"
+    end
+
+    hook_for :test_framework, as: :model
+
+    protected
+
+    def attribute_as_field(att)
+      "field :#{ att.name }, :#{ att.type }"
+    end
+  end
+end

data/lib/generators/push_type/structure/templates/structure.rb

@@ -0,0 +1,10 @@
+class <%= class_name %> < PushType::Structure
+
+  # Model the content by adding custom fields to the structure.
+<% if attributes.each do |att| -%>
+  <%= attribute_as_field(att) %>
+<% end.empty? -%>
+  # field :body, :text, validates: { presence: true }
+<% end -%>
+
+end

data/lib/push_type/core/engine.rb

@@ -8,6 +8,7 @@ module PushType
         g.assets false
         g.helper false
         g.test_framework  :test_unit, fixture: false
+        g.hidden_namespaces << 'push_type:dummy' << 'push_type:field'
       end
 
       config.autoload_paths << config.root.join('app', 'fields')

data/lib/push_type/testing/common_rake.rb

@@ -2,6 +2,7 @@ require 'generators/push_type/dummy/dummy_generator'
 require 'generators/push_type/install/install_generator'
 require 'generators/push_type/node/node_generator'
 require 'generators/push_type/taxonomy/taxonomy_generator'
+require 'generators/push_type/structure/structure_generator'
 
 namespace :common do
 
@@ -18,6 +19,7 @@ namespace :common do
       PushType::InstallGenerator.start ['--quiet']
       PushType::NodeGenerator.start ['page', '--quiet']
       PushType::TaxonomyGenerator.start ['category', '--quiet']
+      PushType::StructureGenerator.start ['location', '--quiet']
     end
   end
 

data/lib/push_type/testing/setup.rb

@@ -14,7 +14,7 @@ Dragonfly.app.use_datastore :memory
 
 class ActiveSupport::TestCase
   # Due to test weirdness / dodgy code need to reference some classes
-  Page && Category
+  Page && Category && Location
 
   before :each do
     DatabaseCleaner.start

data/lib/push_type/version.rb

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

data/test/dummy/app/models/location.rb

@@ -0,0 +1,6 @@
+class Location < PushType::Structure
+
+  # Model the content by adding custom fields to the structure.
+  # field :body, :text, validates: { presence: true }
+
+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 = '95ec48e6fde12daa65a9093d7c6cd8a626019001f388ed0d407154d78ac44f30'
+  # config.dragonfly_secret = '6b584170f7beffa02e545d0b10a296bcd78043ec3e84348e4cb5207e5d89bd01'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 992655c5cb254e30f6a08279cae78c7bb529da42b7f3f598f2ae57e3809c19e934351882962572232d8d2bc801734f7a269b042b04be4263d2b67f1a48406924
+  secret_key_base: ae14194588cf01b5ebefa9a35d39035ce19b5b8461f05df8b022799cf7fde0563a71872fc7ea90059d08322041f6ac2e72a2f55ddbdad6f6d040963b2dd9525d
 
 test:
-  secret_key_base: 1962b2ff958bc3e4bf7281cafde40cb1e34e1419dc68293ac323e874027d1600bb6538bb74ac7f34856ede2702dfe57f5d9eb6c96b00735606fd7b3ba5a9fa1d
+  secret_key_base: 485ce707acb09b599b903c1444a05409b1ecff382d304c1718294ab541fd10ac32d920f66ef6a555725a3cebfd9d0d4e0ad767e6d37fcc563ee79ef8b77b8abb
 
 # 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: 20151102165843) do
+ActiveRecord::Schema.define(version: 20151102202721) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"