faceted 0.6.4 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.7.0

data/faceted.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "faceted"
-  s.version = "0.6.4"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corey Ehmke", "Max Thom Stahl"]
@@ -14,8 +14,7 @@ Gem::Specification.new do |s|
   s.email = "corey@trunkclub.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.md",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".rspec",
@@ -23,13 +22,15 @@ Gem::Specification.new do |s|
     "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
-    "README.rdoc",
     "Rakefile",
     "VERSION",
     "faceted.gemspec",
     "lib/faceted.rb",
     "lib/faceted/collector.rb",
     "lib/faceted/controller.rb",
+    "lib/faceted/has_object.rb",
+    "lib/faceted/interface.rb",
+    "lib/faceted/model.rb",
     "lib/faceted/presenter.rb",
     "spec/collector_spec.rb",
     "spec/presenter_spec.rb",

data/lib/faceted.rb

@@ -1,4 +1,6 @@
 module Faceted
+  require 'faceted/model'
+  require 'faceted/has_object'
   require 'faceted/collector'
   require 'faceted/controller'
   require 'faceted/presenter'

data/lib/faceted/collector.rb

@@ -2,14 +2,14 @@ module Faceted
 
   module Collector
 
-    require 'json'
-    require 'active_support/core_ext/hash'
+    include Faceted::Model
 
     def self.included(base)
       base.extend ActiveModel::Naming
       base.send(:attr_accessor, :errors)
       base.send(:attr_accessor, :success)
       base.extend ClassMethods
+      base.extend Faceted::Model::ModelClassMethods
     end
 
     # Class methods ===========================================================
@@ -31,10 +31,6 @@ module Faceted
         @collects
       end
 
-      def scope
-        parent.to_s == "Object" ? "::" : "#{parent.to_s}::"
-      end
-
     end
 
     # Instance methods =========================================================

data/lib/faceted/controller.rb

@@ -9,7 +9,7 @@ module Faceted
         success:  obj.success,
         response: obj.to_hash,
         errors:   obj.errors
-      }.to_json
+      }
     end
 
     # For rendering a response with a multiple objects, e.g.
@@ -19,7 +19,7 @@ module Faceted
         success: true,
         response: {"#{key}".to_sym => array},
         errors:   nil
-      }.to_json
+      }
     end
 
     # In your base API controller:

data/lib/faceted/has_object.rb

@@ -0,0 +1,68 @@
+module Faceted
+
+  module HasObject
+
+    module ClassMethods
+
+      def fields
+        @fields ||= [:id]
+      end
+
+      def materialize(objects=[])
+        objects.compact.inject([]) do |a, object|
+          instance = self.new
+          instance.send(:object=, object)
+          instance.send(:initialize_with_object)
+          a << instance
+        end
+      end
+
+    end
+
+    # Instance methods =======================================================
+
+    def initialize(args={})
+      self.id = args[:id]
+      initialize_with_object
+      ! args.empty? && args.symbolize_keys.delete_if{|k,v| v.nil?}.each{|k,v| self.send("#{k}=", v) if self.respond_to?("#{k}=") && ! v.blank? }
+      self.errors = []
+      self.success = true
+    end
+
+    def save
+      return false unless schema_fields
+      schema_fields.each{ |k| object.send("#{k}=", self.send(k)) if object.respond_to?("#{k}=") }
+      self.success = object.save
+      self.errors = object.errors && object.errors.full_messages
+      self.success
+    end
+
+    def schema_fields
+      self.class.fields
+    end
+
+    def to_hash
+      schema_fields.inject({}) {|h,k| h[k] = self.send(k); h}
+    end
+
+    private
+
+    def initialize_with_object
+      return unless object
+      schema_fields.each{ |k| self.send("#{k}=", object.send(k)) if self.respond_to?("#{k}=") }
+    end
+
+    def object
+      return unless self.class.klass
+      @object ||= self.id ? self.class.klass.find(self.id) : self.class.klass.new
+    end
+
+    def object=(obj)
+      @object = obj
+      self.id = obj.id
+    end
+
+  end
+
+end
+

data/lib/faceted/interface.rb

@@ -0,0 +1,39 @@
+module Faceted
+
+  module Interface
+
+    include Faceted::HasObject
+
+    # Class methods ===========================================================
+
+    def self.included(base)
+      base.extend ActiveModel::Naming
+      base.extend ClassMethods
+      base.extend Faceted::Model::ModelClassMethods
+      base.send(:attr_accessor, :id)
+      base.send(:attr_accessor, :errors)
+    end
+
+    module ClassMethods
+
+      def klass
+        @wraps
+      end
+
+      def wraps(name, args={})
+        class_name = args[:class_name] || name.to_s.classify
+        @wraps = eval(class_name)
+        define_method :"#{class_name.downcase}" do
+          object
+        end
+      end
+
+      def where(args)
+        materialize(klass.where(args))
+      end
+
+    end
+
+  end
+
+end

data/lib/faceted/model.rb

@@ -0,0 +1,60 @@
+module Faceted
+
+  module Model
+
+    require 'json'
+    require 'active_support/core_ext/hash'
+
+    # Class methods ============================================================
+
+    module ModelClassMethods
+
+      def build_association_from(field)
+        bare_name = field.gsub(/_id$/, '')
+        if field =~ /_id$/
+          klass = eval "#{scope}#{bare_name.classify}"
+          define_method :"#{bare_name}" do
+            klass.new(:id => self.send(field))
+          end
+        end
+      end
+
+      def create(params={})
+        obj = self.new(params)
+        obj.save
+        obj
+      end
+
+      def field(name, args={})
+        fields << name
+        define_method :"#{name}" do
+          instance_variable_get("@#{name}") || args[:default]
+        end
+        define_method :"#{name}=" do |val|
+          instance_variable_set("@#{name}", val)
+        end
+        build_association_from(name.to_s) if name.to_s.include?("id") && ! args[:skip_association]
+      end
+
+      def fields
+        @fields ||= [:id]
+      end
+
+      def materialize(objects=[])
+        objects.compact.inject([]) do |a, object|
+          interface = self.new
+          interface.send(:object=, object)
+          interface.send(:initialize_with_object)
+          a << interface
+        end
+      end
+
+      def scope
+        parent.to_s == "Object" ? "::" : "#{parent.to_s}::"
+      end
+
+    end
+
+  end
+
+end

data/lib/faceted/presenter.rb

@@ -2,14 +2,14 @@ module Faceted
 
   module Presenter
 
-    require 'json'
-    require 'active_support/core_ext/hash'
+    include Faceted::HasObject
 
     # Class methods ===========================================================
 
     def self.included(base)
       base.extend ActiveModel::Naming
       base.extend ClassMethods
+      base.extend Faceted::Model::ModelClassMethods
       base.send(:attr_accessor, :id)
       base.send(:attr_accessor, :errors)
       base.send(:attr_accessor, :success)
@@ -17,52 +17,7 @@ module Faceted
 
     module ClassMethods
 
-      def build_association_from(field)
-        bare_name = field.gsub(/_id$/, '')
-        if field =~ /_id$/
-          klass = eval "#{scope}#{bare_name.classify}"
-          define_method :"#{bare_name}" do
-            klass.new(:id => self.send(field))
-          end
-        end
-      end
-
-      def create(params={})
-        obj = self.new(params)
-        obj.save
-        obj
-      end
-
-      def field(name, args={})
-
-        fields << name
-
-        define_method :"#{name}" do
-          instance_variable_get("@#{name}") || args[:default]
-        end
-
-        define_method :"#{name}=" do |val|
-          instance_variable_set("@#{name}", val)
-        end
-
-        build_association_from(name.to_s) if name.to_s.include?("id") && ! args[:skip_association]
-
-      end
-
-      def fields
-        @fields ||= [:id]
-      end
-
-      def materialize(objects=[])
-        objects.compact.inject([]) do |a, object|
-          presenter = self.new
-          presenter.send(:object=, object)
-          presenter.send(:initialize_with_object)
-          a << presenter
-        end
-      end
-
-      def presented_class
+      def klass
         @presents
       end
 
@@ -74,58 +29,12 @@ module Faceted
         end
       end
 
-      def scope
-        parent.to_s == "Object" ? "::" : "#{parent.to_s}::"
-      end
-
       def where(args)
-        materialize(presented_class.where(args))
+        materialize(klass.where(args))
       end
 
     end
 
-    # Instance methods =======================================================
-
-    def initialize(args={})
-      self.id = args[:id]
-      initialize_with_object
-      ! args.empty? && args.symbolize_keys.delete_if{|k,v| v.nil?}.each{|k,v| self.send("#{k}=", v) if self.respond_to?("#{k}=") && ! v.blank? }
-      self.errors = []
-      self.success = true
-    end
-
-    def save
-      schema_fields.each{ |k| object.send("#{k}=", self.send(k)) if object.respond_to?("#{k}=") }
-      self.success = object.save
-      self.errors = object.errors && object.errors.full_messages
-      self.success
-    end
-
-    def to_hash
-      schema_fields.inject({}) {|h,k| h[k] = self.send(k); h}
-    end
-
-    private
-
-    def initialize_with_object
-      return unless object
-      schema_fields.each{ |k| self.send("#{k}=", object.send(k)) if self.respond_to?("#{k}=") }
-    end
-
-    def object
-      return unless self.class.presented_class
-      @object ||= self.id ? self.class.presented_class.find(self.id) : self.class.presented_class.new
-    end
-
-    def object=(obj)
-      @object = obj
-      self.id = obj.id
-    end
-
-    def schema_fields
-      self.class.fields
-    end
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -147,20 +147,21 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
-- README.rdoc
 files:
 - .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
-- README.rdoc
 - Rakefile
 - VERSION
 - faceted.gemspec
 - lib/faceted.rb
 - lib/faceted/collector.rb
 - lib/faceted/controller.rb
+- lib/faceted/has_object.rb
+- lib/faceted/interface.rb
+- lib/faceted/model.rb
 - lib/faceted/presenter.rb
 - spec/collector_spec.rb
 - spec/presenter_spec.rb
@@ -180,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3167010834966888439
+      hash: -2908557323860835992
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/README.rdoc

@@ -1,21 +0,0 @@
-= faceted
-
-A set of tools, patterns, and modules for use in API implementations.
-
-This software is alpha and not production-ready.
-
-== Contributing to faceted
-
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2012 Corey Ehmke. See LICENSE.txt for
-further details.
-