her 0.5.3 → 0.5.4

data/examples/grape-and-her/consumer/app/assets/stylesheets/reset.scss

@@ -0,0 +1,53 @@
+/* http://meyerweb.com/eric/tools/css/reset/ */
+/* v1.0 | 20080212 */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	background: transparent;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+	text-decoration: none;
+}
+del {
+	text-decoration: line-through;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}

data/examples/grape-and-her/consumer/app/consumer.rb

@@ -0,0 +1,74 @@
+class Consumer < Sinatra::Base
+  configure do
+    set :root, -> { File.expand_path("./") }
+    set :views, -> { File.join(root, "app/views") }
+    set :haml, :format => :html5, :attr_wrapper => '"', :ugly => true
+  end
+
+  configure :development do
+    register Sinatra::Reloader
+  end
+
+  helpers Sprockets::Helpers
+
+  before do
+    $strio.truncate(0)
+  end
+
+  # GET /
+  get '/' do
+    haml :index
+  end
+
+  # GET /users
+  get '/users' do
+    @users = User.all
+    @user = User.new
+
+    haml :'users/index'
+  end
+
+  # GET /users/:id
+  get '/users/:id' do
+    @user = User.find(params[:id])
+    haml :'users/show'
+  end
+
+  # GET /post
+  post '/users' do
+    @users = User.all
+    @user = User.new(params[:user])
+
+    if @user.save
+      redirect to('/users')
+    else
+      haml :'users/index'
+    end
+  end
+
+  # GET /organizations
+  get '/organizations' do
+    @organizations = Organization.all
+    @organization = Organization.new
+
+    haml :'organizations/index'
+  end
+
+  # GET /organizations/:id
+  get '/organizations/:id' do
+    @organization = Organization.find(params[:id])
+    haml :'organizations/show'
+  end
+
+  # GET /post
+  post '/organizations' do
+    @organizations = Organization.all
+    @organization = Organization.new(params[:organization])
+
+    if @organization.save
+      redirect to('/organizations')
+    else
+      haml :'organizations/index'
+    end
+  end
+end

data/examples/grape-and-her/consumer/app/models/organization.rb

@@ -0,0 +1,13 @@
+class Organization
+  include Her::Model
+
+  # Attributes
+  attributes :name
+
+  # Associations
+  has_many :users
+
+  # Parsing options
+  parse_root_in_json true
+  include_root_in_json true
+end

data/examples/grape-and-her/consumer/app/models/user.rb

@@ -0,0 +1,13 @@
+class User
+  include Her::Model
+
+  # Attributes
+  attributes :email, :fullname, :organization_id
+
+  # Associations
+  belongs_to :organization
+
+  # Parsing options
+  parse_root_in_json true
+  include_root_in_json true
+end

data/examples/grape-and-her/consumer/app/views/index.haml

@@ -0,0 +1,9 @@
+%h2
+  %a{ href: '/organizations' } Organizations
+%pre= File.read(File.join(settings.root, "app/models/organization.rb"))
+
+%hr
+
+%h2
+  %a{ href: '/users' } Users
+%pre= File.read(File.join(settings.root, "app/models/user.rb"))

data/examples/grape-and-her/consumer/app/views/layout.haml

@@ -0,0 +1,20 @@
+!!! 5
+%head
+  %title Grape + Her example
+  %link{ rel: "stylesheet", type: "text/css", href: "http://fonts.googleapis.com/css?family=Pacifico" }
+  %link{ type: "text/css", rel: "stylesheet", media: 'screen', href: stylesheet_path("application") }
+%body
+  #wrap
+    %header#main-header
+      %h1
+        %a{ href: '/' }
+          %strong
+            Her
+          %span
+            Grape + Her example
+      %hr
+    #content
+      = yield
+  %footer#main-footer
+    %pre
+      = $strio.string

data/examples/grape-and-her/consumer/app/views/organizations/index.haml

@@ -0,0 +1,25 @@
+%h2 Create new organization
+
+%form{ url: "/organizations", method: 'post' }
+  - if @organization.response_errors.any?
+    %ul.errors
+      %p The organization could not be created:
+      %ul
+        - @organization.response_errors.each do |error|
+          %li= error
+
+  %p
+    %label{ for: 'name' } Name
+    %input{ type: 'text', name: 'organization[name]', value: @organization.name, id: 'name' }
+  %p
+    %button{ type: 'submit' } Create
+
+%hr
+%h3 Current organizations
+- if @organizations.any?
+  %ul.records
+    - @organizations.each do |organization|
+      %li
+        %a{ href: "/organizations/#{organization.id}" }= organization.name
+- else
+  %p.no-records There are currently no organizations.

data/examples/grape-and-her/consumer/app/views/organizations/show.haml

@@ -0,0 +1,11 @@
+%h1= @organization.name
+
+%h2 Users
+%ul.details
+  - @organization.users.each do |user|
+    %li
+      %a{ href: "/users/#{user.id}" }= user.fullname
+
+%hr
+.back
+  %p Back to <a href="/organizations">organizations</a>

data/examples/grape-and-her/consumer/app/views/users/index.haml

@@ -0,0 +1,33 @@
+%h2 Create new user
+
+%form{ url: "/users", method: 'post' }
+  - if @user.response_errors.any?
+    .errors
+      %p The user could not be created:
+      %ul
+        - @user.response_errors.each do |error|
+          %li= error
+
+  %p
+    %label{ for: 'email' } Email
+    %input{ type: 'email', name: 'user[email]', value: @user.email, id: 'email' }
+  %p
+    %label{ for: 'fullname' } Full Name
+    %input{ type: 'text', name: 'user[fullname]', value: @user.fullname, id: 'fullname' }
+  %p
+    %label{ for: 'organization_id' } Organization
+    %select{ name: 'user[organization_id]', id: 'organization_id' }
+      - Organization.all.each do |organization|
+        %option{ value: organization.id }= organization.name
+  %p
+    %button{ type: 'submit' } Create
+
+%hr
+%h3 Current users
+- if @users.any?
+  %ul.records
+    - @users.each do |user|
+      %li
+        %a{ href: "/users/#{user.id}" }= user.fullname
+- else
+  %p.no-records There are currently no users.

data/examples/grape-and-her/consumer/app/views/users/show.haml

@@ -0,0 +1,9 @@
+%h1= @user.fullname
+
+%ul.details
+  %li <strong>Email:</strong> #{@user.email}
+  %li <strong>Organization:</strong> <a href="/organizations/#{@user.organization_id}">#{@user.organization.name}</a>
+
+%hr
+.back
+  %p Back to <a href="/users">users</a>

data/examples/grape-and-her/consumer/config.ru

@@ -0,0 +1,20 @@
+require File.expand_path('../config/boot',  __FILE__)
+
+map "/assets" do
+  sprockets = Sprockets::Environment.new.tap do |s|
+    s.append_path File.join(File.dirname(__FILE__), 'app', 'assets', 'stylesheets')
+    s.append_path File.join(File.dirname(__FILE__), 'app', 'assets', 'images')
+
+    Sprockets::Helpers.configure do |config|
+      config.environment = s
+      config.prefix = "/assets"
+      config.digest = true
+    end
+  end
+
+  run sprockets
+end
+
+map "/" do
+  run Consumer
+end

data/examples/grape-and-her/consumer/config/boot.rb

@@ -0,0 +1,30 @@
+# Bundler setup
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+Bundler.require(:default, ENV['RACK_ENV']) if defined? Bundler
+
+# Require libraries
+Dir[File.expand_path('../../lib/**/*.rb', __FILE__)].each do |file|
+  dirname = File.dirname(file)
+  file_basename = File.basename(file, File.extname(file))
+  require "#{dirname}/#{file_basename}"
+end
+
+# Configure Her
+Her::API.setup :url => "http://0.0.0.0:3100" do |c|
+  c.use Faraday::Request::UrlEncoded
+  c.use Her::Middleware::DefaultParseJSON
+  c.use ResponseBodyLogger, $logger
+  c.use Faraday::Response::Logger, $logger
+  c.use Faraday::Adapter::NetHttp
+end
+
+# Require models
+Dir[File.expand_path('../../app/models/**/*.rb', __FILE__)].each do |file|
+  dirname = File.dirname(file)
+  file_basename = File.basename(file, File.extname(file))
+  require "#{dirname}/#{file_basename}"
+end
+
+# Application setup
+require File.expand_path('../../app/consumer',  __FILE__)

data/examples/grape-and-her/consumer/config/unicorn.rb

@@ -0,0 +1,7 @@
+if ENV["RACK_ENV"] == "development"
+  worker_processes 1
+else
+  worker_processes 4
+end
+
+timeout 30

data/examples/grape-and-her/consumer/lib/response_logger.rb

@@ -0,0 +1,18 @@
+require 'stringio'
+require 'logger'
+
+class ResponseBodyLogger < Faraday::Response::Middleware
+  def initialize(app, logger)
+    @app = app
+    @logger = logger
+  end
+
+  def on_complete(env)
+    @logger.info ""
+    @logger.info env[:body]
+    @logger.info "\n"
+  end
+end
+
+$strio = StringIO.new
+$logger = Logger.new($strio).tap { |logger| logger.formatter = proc { |severity, datetime, progname, msg| "#{msg}\n" } }

data/her.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 2.13"
-  s.add_development_dependency "mocha", "~> 0.13"
+  s.add_development_dependency "fivemat", "~> 1.2"
 
   s.add_runtime_dependency "activemodel", ">= 3.0.0"
   s.add_runtime_dependency "activesupport", ">= 3.0.0"
   s.add_runtime_dependency "faraday", "~> 0.8"
-  s.add_runtime_dependency "multi_json", "~> 1.5"
+  s.add_runtime_dependency "multi_json", "~> 1.7"
 end

data/lib/her/model.rb

@@ -1,6 +1,8 @@
 require "her/model/base"
 require "her/model/http"
+require "her/model/attributes"
 require "her/model/orm"
+require "her/model/parse"
 require "her/model/associations"
 require "her/model/introspection"
 require "her/model/paths"
@@ -21,48 +23,42 @@ module Her
   module Model
     extend ActiveSupport::Concern
 
-    # Instance methods
+    # Her modules
+    include Her::Model::Base
+    include Her::Model::Attributes
     include Her::Model::ORM
+    include Her::Model::HTTP
+    include Her::Model::Parse
     include Her::Model::Introspection
     include Her::Model::Paths
     include Her::Model::Associations
     include Her::Model::NestedAttributes
+
+    # Supported ActiveModel modules
     include ActiveModel::Validations
     include ActiveModel::Conversion
     include ActiveModel::Dirty
+    include ActiveModel::Naming
+    include ActiveModel::Translation
 
     # Class methods
     included do
-      extend Her::Model::Base
-      extend Her::Model::HTTP
-      extend ActiveModel::Naming
-      extend ActiveModel::Translation
+      # Define the root element name, used when `parse_root_in_json` is set to `true`
+      root_element self.name.split("::").last.underscore.to_sym
 
-      extend ActiveModel::Callbacks
-      define_model_callbacks :create, :update, :save, :find, :destroy
+      # Define resource and collection paths
+      collection_path "#{root_element.to_s.pluralize}"
+      resource_path "#{root_element.to_s.pluralize}/:id"
 
-      # Define default settings
-      root_element self.name.split("::").last.underscore
-      base_path = root_element.pluralize
-      collection_path "#{base_path}"
-      resource_path "#{base_path}/:id"
+      # Assign the default API
       uses_api Her::API.default_api
-    end
 
-    # Returns true if attribute_name is
-    # * in orm data
-    # * an association
-    def has_key?(attribute_name)
-      has_data?(attribute_name) ||
-      has_association?(attribute_name)
-    end
+      # Define the default primary key
+      primary_key :id
 
-    # Returns
-    # * the value of the attribute_nane attribute if it's in orm data
-    # * the resource/collection corrsponding to attribute_name if it's an association
-    def [](attribute_name)
-      get_data(attribute_name) ||
-      get_association(attribute_name)
+      # Configure ActiveModel callbacks
+      extend ActiveModel::Callbacks
+      define_model_callbacks :create, :update, :save, :find, :destroy
     end
   end
 end