faceted 1.0.8 → 1.1.0

data/Gemfile

@@ -3,13 +3,15 @@ source "http://rubygems.org"
 # Example:
 gem "activesupport", ">= 2.3.5"
 gem "activemodel"
+gem "rails"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-group :development do
+group :development, :test do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "rspec"
+  gem "rspec-rails"
   gem "bundler"
   gem "jeweler", "~> 1.8.4"
   gem "simplecov"

data/Gemfile.lock

@@ -1,23 +1,76 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
     activemodel (3.2.8)
       activesupport (= 3.2.8)
       builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
     activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    arel (3.0.2)
     builder (3.0.3)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     git (1.2.5)
+    hike (1.2.1)
     i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
+    journey (1.0.4)
     json (1.7.5)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
     multi_json (1.3.6)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -29,6 +82,11 @@ GEM
     rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.2)
+    rspec-rails (2.11.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
     shoulda (3.1.1)
       shoulda-context (~> 1.0)
       shoulda-matchers (~> 1.2)
@@ -39,6 +97,16 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -48,7 +116,9 @@ DEPENDENCIES
   activesupport (>= 2.3.5)
   bundler
   jeweler (~> 1.8.4)
+  rails
   rdoc (~> 3.12)
   rspec
+  rspec-rails
   shoulda
   simplecov

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.1.0

data/faceted.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "faceted"
-  s.version = "1.0.8"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corey Ehmke", "Max Thom Stahl"]
-  s.date = "2012-12-06"
+  s.date = "2012-12-07"
   s.description = "Faceted provides set of tools, patterns, and modules for use in API implementations."
   s.email = "corey@trunkclub.com"
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/faceted/model.rb",
     "lib/faceted/presenter.rb",
     "spec/collector_spec.rb",
+    "spec/controller_spec.rb",
     "spec/presenter_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -48,18 +49,22 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_runtime_dependency(%q<activemodel>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_dependency(%q<activemodel>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
@@ -67,9 +72,11 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
     s.add_dependency(%q<activemodel>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])

data/lib/faceted/controller.rb

@@ -4,12 +4,12 @@ module Faceted
 
     # For rendering a response with a single object, e.g.
     # render_response(@address)
-    def render_response(obj)
+    def render_response(obj, code=nil)
       render :json => {
         success:  obj.success,
         response: obj.to_hash,
         errors:   obj.errors
-      }
+      }, :status => code || obj.success ? 200 : 400
     end
 
     # For rendering a response with a multiple objects, e.g.
@@ -18,7 +18,7 @@ module Faceted
       render :json => {
         success: true,
         response: {"#{key}".to_sym => array},
-        errors:   nil
+        errors: nil
       }
     end
 
@@ -28,8 +28,8 @@ module Faceted
       render :json => {
         success: false,
         response: nil,
-        errors: "Record not found: #{exception.message}"
-      }, :status => 404
+        errors: "#{exception.message}"
+      }, :status => 400
     end
 
     # In your base API controller:

data/spec/controller_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+class Birthplace # Mock AR model
+  attr_accessor :id, :city, :state
+  def initialize(params={}); params.each{|k,v| self.send("#{k}=",v) if self.respond_to?(k)}; end
+  def attributes; {:id => self.id, :city => self.city, :state => self.state}; end
+  def reload; self; end
+end
+
+module MyApi
+
+  class MyApi::Application < Rails::Application
+  end
+
+  class Birthplace
+    include Faceted::Presenter
+    presents :birthplace
+    field :city
+    field :state
+  end
+
+  class BirthplacesController < ActionController::Base
+    include Faceted::Controller
+    include Rails.application.routes.url_helpers
+    def show
+      @birthplace = MyApi::Birthplace.first
+      render_response @birthplace
+    end
+
+  end
+
+end
+
+describe MyApi::BirthplacesController, :type => :controller  do
+
+  before do
+    MyApi::Birthplace.stub(:first) { MyApi::Birthplace.new }
+    MyApi::Application.routes.draw do
+      namespace :my_api do
+        resources :birthplaces
+      end
+    end
+  end
+
+  it 'renders with a 200 when the operation is successful' do
+    MyApi::Birthplace.any_instance.stub(:success) { true }
+    get :show, :id => 1
+    response.code.should == "200"
+  end
+
+  it 'renders with a 400 when the operation is unsuccessful' do
+    MyApi::Birthplace.any_instance.stub(:success) { false }
+    get :show, :id => 1
+    response.code.should == "400"
+  end
+
+end

data/spec/spec_helper.rb

@@ -3,3 +3,6 @@ require 'active_model'
 require 'active_support'
 require 'bundler/setup'
 require 'faceted'
+require 'rails/all'
+require 'rspec'
+require 'rspec/rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +108,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +196,7 @@ files:
 - lib/faceted/model.rb
 - lib/faceted/presenter.rb
 - spec/collector_spec.rb
+- spec/controller_spec.rb
 - spec/presenter_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/trunkclub/faceted
@@ -181,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1963421351288044790
+      hash: -4341699658491499181
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: