her 0.5.3 → 0.5.4

data/spec/spec_helper.rb

@@ -1,46 +1,21 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require "rspec"
-require "mocha/api"
 require "her"
 
+# Require everything in `spec/support`
+Dir[File.expand_path('../../spec/support/**/*.rb', __FILE__)].map(&method(:require))
+
 RSpec.configure do |config|
-  config.mock_with :mocha
+  config.include Her::Testing::Macros::ModelMacros
 
   config.before :each do
-    @globals = []
+    @spawned_models = []
   end
 
   config.after :each do
-    @globals.each do |global|
-      Object.instance_eval { remove_const global } if Object.const_defined?(global)
-    end
-  end
-end
-
-class Hash
-  def to_json; MultiJson.dump(self); end
-end
-
-class Array
-  def to_json; MultiJson.dump(self); end
-end
-
-def spawn_model(klass, &block)
-  if klass =~ /::/
-    base, submodel = klass.split(/::/).map{ |s| s.to_sym }
-    Object.const_set(base, Module.new) unless Object.const_defined?(base)
-    Object.const_get(base).module_eval do
-      remove_const submodel if constants.include?(submodel)
-      submodel = const_set(submodel, Class.new)
-      submodel.send(:include, Her::Model)
-      submodel.class_eval(&block) if block_given?
+    @spawned_models.each do |model|
+      Object.instance_eval { remove_const model } if Object.const_defined?(model)
     end
-    @globals << base
-  else
-    Object.instance_eval { remove_const klass } if Object.const_defined?(klass)
-    Object.const_set(klass, Class.new).send(:include, Her::Model)
-    Object.const_get(klass).class_eval(&block) if block_given?
-    @globals << klass.to_sym
   end
 end

data/spec/support/extensions/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def to_json
+    MultiJson.dump(self)
+  end
+end

data/spec/support/extensions/hash.rb

@@ -0,0 +1,5 @@
+class Hash
+  def to_json
+    MultiJson.dump(self)
+  end
+end

data/spec/support/macros/model_macros.rb

@@ -0,0 +1,29 @@
+module Her
+  module Testing
+    module Macros
+      module ModelMacros
+        # Create a class and automatically inject Her::Model into it
+        def spawn_model(klass, &block)
+          if klass =~ /::/
+            base, submodel = klass.split(/::/).map{ |s| s.to_sym }
+            Object.const_set(base, Module.new) unless Object.const_defined?(base)
+            Object.const_get(base).module_eval do
+              remove_const submodel if constants.include?(submodel)
+              submodel = const_set(submodel, Class.new)
+              submodel.send(:include, Her::Model)
+              submodel.class_eval(&block) if block_given?
+            end
+
+            @spawned_models << base
+          else
+            Object.instance_eval { remove_const klass } if Object.const_defined?(klass)
+            Object.const_set(klass, Class.new).send(:include, Her::Model)
+            Object.const_get(klass).class_eval(&block) if block_given?
+
+            @spawned_models << klass.to_sym
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: fivemat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
 description: Her is an ORM that maps REST resources and collections to Ruby objects
 email:
 - remi@exomel.com
@@ -124,14 +124,41 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.md
-- examples/twitter-oauth/Gemfile
-- examples/twitter-oauth/app.rb
-- examples/twitter-oauth/config.ru
-- examples/twitter-oauth/views/index.haml
-- examples/twitter-search/Gemfile
-- examples/twitter-search/app.rb
-- examples/twitter-search/config.ru
-- examples/twitter-search/views/index.haml
+- examples/grape-and-her/.env.default
+- examples/grape-and-her/Procfile
+- examples/grape-and-her/README.md
+- examples/grape-and-her/api/Gemfile
+- examples/grape-and-her/api/Rakefile
+- examples/grape-and-her/api/app/api.rb
+- examples/grape-and-her/api/app/models/organization.rb
+- examples/grape-and-her/api/app/models/user.rb
+- examples/grape-and-her/api/app/views/organizations/_base.rabl
+- examples/grape-and-her/api/app/views/organizations/index.rabl
+- examples/grape-and-her/api/app/views/organizations/show.rabl
+- examples/grape-and-her/api/app/views/users/_base.rabl
+- examples/grape-and-her/api/app/views/users/index.rabl
+- examples/grape-and-her/api/app/views/users/show.rabl
+- examples/grape-and-her/api/config.ru
+- examples/grape-and-her/api/config/boot.rb
+- examples/grape-and-her/api/config/unicorn.rb
+- examples/grape-and-her/api/db/migrations/001_create_users.rb
+- examples/grape-and-her/api/db/migrations/002_create_organizations.rb
+- examples/grape-and-her/consumer/Gemfile
+- examples/grape-and-her/consumer/app/assets/stylesheets/application.scss
+- examples/grape-and-her/consumer/app/assets/stylesheets/reset.scss
+- examples/grape-and-her/consumer/app/consumer.rb
+- examples/grape-and-her/consumer/app/models/organization.rb
+- examples/grape-and-her/consumer/app/models/user.rb
+- examples/grape-and-her/consumer/app/views/index.haml
+- examples/grape-and-her/consumer/app/views/layout.haml
+- examples/grape-and-her/consumer/app/views/organizations/index.haml
+- examples/grape-and-her/consumer/app/views/organizations/show.haml
+- examples/grape-and-her/consumer/app/views/users/index.haml
+- examples/grape-and-her/consumer/app/views/users/show.haml
+- examples/grape-and-her/consumer/config.ru
+- examples/grape-and-her/consumer/config/boot.rb
+- examples/grape-and-her/consumer/config/unicorn.rb
+- examples/grape-and-her/consumer/lib/response_logger.rb
 - her.gemspec
 - lib/her.rb
 - lib/her/api.rb
@@ -144,11 +171,13 @@ files:
 - lib/her/middleware/second_level_parse_json.rb
 - lib/her/model.rb
 - lib/her/model/associations.rb
+- lib/her/model/attributes.rb
 - lib/her/model/base.rb
 - lib/her/model/http.rb
 - lib/her/model/introspection.rb
 - lib/her/model/nested_attributes.rb
 - lib/her/model/orm.rb
+- lib/her/model/parse.rb
 - lib/her/model/paths.rb
 - lib/her/version.rb
 - spec/api_spec.rb
@@ -157,6 +186,7 @@ files:
 - spec/middleware/first_level_parse_json_spec.rb
 - spec/middleware/second_level_parse_json_spec.rb
 - spec/model/associations_spec.rb
+- spec/model/attributes_spec.rb
 - spec/model/callbacks_spec.rb
 - spec/model/dirty_spec.rb
 - spec/model/http_spec.rb
@@ -167,6 +197,9 @@ files:
 - spec/model/validations_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
+- spec/support/extensions/array.rb
+- spec/support/extensions/hash.rb
+- spec/support/macros/model_macros.rb
 homepage: http://remiprev.github.com/her
 licenses:
 - MIT
@@ -199,6 +232,7 @@ test_files:
 - spec/middleware/first_level_parse_json_spec.rb
 - spec/middleware/second_level_parse_json_spec.rb
 - spec/model/associations_spec.rb
+- spec/model/attributes_spec.rb
 - spec/model/callbacks_spec.rb
 - spec/model/dirty_spec.rb
 - spec/model/http_spec.rb
@@ -209,3 +243,6 @@ test_files:
 - spec/model/validations_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
+- spec/support/extensions/array.rb
+- spec/support/extensions/hash.rb
+- spec/support/macros/model_macros.rb

data/examples/twitter-oauth/Gemfile

@@ -1,13 +0,0 @@
-source :rubygems
-
-gem "sinatra"
-gem "haml"
-gem "thin", :require => false
-gem "faraday_middleware"
-gem "simple_oauth"
-
-gem "her", :path => File.join(File.dirname(__FILE__),"../..")
-
-group :development do
-  gem "shotgun"
-end

data/examples/twitter-oauth/app.rb

@@ -1,50 +0,0 @@
-# Create custom parser
-class TwitterParser < Faraday::Response::Middleware
-  def on_complete(env)
-    json = MultiJson.load(env[:body], :symbolize_keys => true)
-    errors = [json.delete(:error)]
-    env[:body] = {
-      :data => json,
-      :errors => errors,
-      :metadata => {},
-    }
-  end
-end
-
-# See https://dev.twitter.com/apps
-TWITTER_CREDENTIALS = {
-  :consumer_key => "",
-  :consumer_secret => "",
-  :token => "",
-  :token_secret => ""
-}
-
-# Initialize API
-Her::API.setup :url => "https://api.twitter.com/1/" do |builder|
-  builder.use FaradayMiddleware::OAuth, TWITTER_CREDENTIALS
-  builder.use Faraday::Request::UrlEncoded
-  builder.use TwitterParser
-  builder.use Faraday::Adapter::NetHttp
-end
-
-# Define classes
-class Tweet
-  include Her::Model
-
-  def self.timeline
-    get "/statuses/home_timeline.json"
-  end
-
-  def self.mentions
-    get "/statuses/mentions.json"
-  end
-
-  def username
-    user[:screen_name]
-  end
-end
-
-get "/" do
-  @tweets = Tweet.mentions
-  haml :index
-end

data/examples/twitter-oauth/config.ru

@@ -1,5 +0,0 @@
-require "bundler"
-Bundler.require
-
-require "./app"
-run Sinatra::Application

data/examples/twitter-oauth/views/index.haml

@@ -1,9 +0,0 @@
-!!!
-%html
-%body
-  %ul
-    - @tweets.each do |tweet|
-      %li{ :style => "margin: 0 0 10px" }
-        %span= tweet.text
-        %br
-        %strong= tweet.username

data/examples/twitter-search/Gemfile

@@ -1,12 +0,0 @@
-source :rubygems
-
-gem "sinatra"
-gem "haml"
-gem "thin", :require => false
-gem "faraday_middleware"
-
-gem "her", :path => File.join(File.dirname(__FILE__),"../..")
-
-group :development do
-  gem "shotgun"
-end

data/examples/twitter-search/app.rb

@@ -1,55 +0,0 @@
-# Create custom parser
-class TwitterSearchParser < Faraday::Response::Middleware
-  METADATA_KEYS = [:completed_in, :max_id, :max_id_str, :next_page, :page, :query, :refresh_url, :results_per_page, :since_id, :since_id_str]
-
-  def on_complete(env)
-    json = MultiJson.load(env[:body], :symbolize_keys => true)
-    data = json.delete(:results)
-    errors = [json.delete(:error)].compact
-    env[:body] = {
-      :data => data,
-      :errors => errors,
-      :metadata => json
-    }
-  end
-end
-
-class MyCache < Hash
-  def read(key)
-    if cached = self[key]
-      Marshal.load(cached)
-    end
-  end
-
-  def write(key, data)
-    self[key] = Marshal.dump(data)
-  end
-
-  def fetch(key)
-    read(key) || yield.tap { |data| write(key, data) }
-  end
-end
-
-$cache = MyCache.new
-
-# Initialize API
-Her::API.setup :url => "http://search.twitter.com" do |connection|
-  connection.use Faraday::Request::UrlEncoded
-  connection.use FaradayMiddleware::Caching, $cache
-  connection.use TwitterSearchParser
-  connection.use Faraday::Adapter::NetHttp
-end
-
-# Define classes
-class Tweet
-  include Her::Model
-
-  def self.search(query, attrs={})
-    get("/search.json", attrs.merge(:q => query))
-  end
-end
-
-get "/" do
-  @tweets = Tweet.search("justin bieber", :rpp => 30)
-  haml :index
-end

data/examples/twitter-search/config.ru

@@ -1,5 +0,0 @@
-require "bundler"
-Bundler.require
-
-require "./app"
-run Sinatra::Application

data/examples/twitter-search/views/index.haml

@@ -1,9 +0,0 @@
-!!!
-%html
-%body
-  %ul
-    - @tweets.each do |tweet|
-      %li{ :style => "margin: 0 0 10px" }
-        %span= tweet.text
-        %br
-        %strong= tweet.from_user