biceps 0.0.3 → 0.0.4

data/lib/biceps.rb

@@ -1,11 +1,6 @@
 require 'biceps/core_ext/action_dispatch/routing/mapper'
-require 'biceps/core_ext/action_controller/base'
 
-module Biceps
-  autoload :ApiVersion,      'biceps/api_version'
-  autoload :ModelVersioning, 'biceps/model_versioning'
-  autoload :Jsonp,           'biceps/jsonp'
-  autoload :Serializer,      'biceps/serializer'
-  autoload :Parser,          'biceps/parser'
-  autoload :Builder,         'biceps/builder'
-end
+module Biceps; end
+
+require 'biceps/api_version'
+require 'biceps/test_helper'

data/lib/biceps/api_version.rb

@@ -1,13 +1,36 @@
 module Biceps
   class ApiVersion
-    attr_accessor :version
+    attr_accessor :version, :accept
 
     def initialize(version)
-      @version = version
+      @version = [version].flatten
     end
 
     def matches?(request)
-      Biceps::Parser.new(request, version).valid?
+      @accept = request.accept
+      valid_api_version?
+    end
+
+
+    private
+    def valid_api_version?
+      version.include?(request_version)
+    end
+
+    def request_version
+      is_api_call?[1].to_i if is_api_call?
+    end
+
+    def is_api_call?
+      @is_api_call = accept.match(regex)
+    end
+
+    def regex
+      Regexp.new("application/vnd.#{app_name};ver=([0-9]+)")
+    end
+
+    def app_name
+      Rails.application.class.to_s.split('::').first.underscore
     end
   end
 end

data/lib/biceps/test_helper.rb

@@ -0,0 +1,38 @@
+module Biceps
+  class << self
+    @@force_test_version = false
+
+    def force_test_version=(version)
+      @@force_test_version = version
+    end
+
+    def force_test_version
+      @@force_test_version
+    end
+
+    def clean_test_version
+      @@force_test_version = false
+    end
+
+    def force_test_version?
+      !!@@force_test_version
+    end
+  end
+
+  module TestHelper
+    def self.included(base)
+      base.class_eval do
+        def self.mock_api_version(version)
+          before do
+            ::Biceps.force_test_version = version
+          end
+
+          after do
+            ::Biceps.clean_test_version
+          end
+        end
+      end
+    end
+  end
+
+end

data/lib/biceps/version.rb

@@ -1,3 +1,3 @@
 module Biceps
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biceps
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2012-02-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70142658651840 !ruby/object:Gem::Requirement
+  requirement: &70320728877400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142658651840
+  version_requirements: *70320728877400
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70142658648680 !ruby/object:Gem::Requirement
+  requirement: &70320728876760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142658648680
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70142658645460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :development
-  prerelease: false
-  version_requirements: *70142658645460
+  version_requirements: *70320728876760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70142658643020 !ruby/object:Gem::Requirement
+  requirement: &70320728876140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *70142658643020
+  version_requirements: *70320728876140
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70142658638120 !ruby/object:Gem::Requirement
+  requirement: &70320728875580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70142658638120
+  version_requirements: *70320728875580
 description: Create a versioned API with rails
 email: dev@evome.fr
 executables: []
@@ -74,13 +63,8 @@ extra_rdoc_files: []
 files:
 - lib/biceps.rb
 - lib/biceps/api_version.rb
-- lib/biceps/builder.rb
-- lib/biceps/core_ext/action_controller/base.rb
 - lib/biceps/core_ext/action_dispatch/routing/mapper.rb
-- lib/biceps/jsonp.rb
-- lib/biceps/model_versioning.rb
-- lib/biceps/parser.rb
-- lib/biceps/serializer.rb
+- lib/biceps/test_helper.rb
 - lib/biceps/version.rb
 homepage: https://github.com/evome/biceps
 licenses: []

data/lib/biceps/builder.rb

@@ -1,32 +0,0 @@
-module Biceps
-  module Builder
-
-    # instiantiate_for_api(User, params[:user]) == Constructor.new(User,params[:user], 1)
-    def self.new(resource, params, version)
-      begin
-        constant = "Builders::#{resource}::V#{version}".constantize
-        instance = constant.new(resource.new, params).resource
-      rescue NameError
-        #
-        # The builder for that version is not defined
-        # Use the model's internal initialize
-        instance = resource.new params
-      end
-
-      instance
-    end
-
-    class Base
-      attr_reader :resource, :params
-
-      extend ActiveModel::Callbacks
-      define_model_callbacks :initialize, :only => :after
-
-      def initialize(resource, params)
-        run_callbacks :initialize do
-          @resource, @params = resource, params
-        end
-      end
-    end
-  end
-end

data/lib/biceps/core_ext/action_controller/base.rb

@@ -1,7 +0,0 @@
-ActionController::Base.class_eval do
-
-  def initialize_for_api(resource, params)
-    api_version = Biceps::Parser.new(request).version
-    Biceps::Builder.new(resource, params, api_version)
-  end
-end

data/lib/biceps/jsonp.rb

@@ -1,67 +0,0 @@
-module Biceps
-  class Jsonp
-    attr_reader :app, :callback_param
-
-    def initialize(app, options = {})
-      @app = app
-      @callback_param = options[:callback_param] || 'callback'
-    end
-
-    # Proxies the request to the application, stripping out the JSON-P callback
-    # method and padding the response with the appropriate callback format.
-    #
-    # Changes nothing if no <tt>callback</tt> param is specified.
-    #
-    def call(env)
-      Parser.new(self, env).perform
-    end
-
-    class Parser
-      attr_reader :jsonp, :env, :request
-      attr_accessor :status, :headers, :response
-
-      delegate :callback_param, :to => :jsonp
-      delegate :app, :to => :jsonp
-
-      def initialize(jsonp, env)
-        @jsonp, @env = jsonp, env
-        @request = Rack::Request.new(@env)
-        @status, @headers, @response = app.call(env)
-      end
-
-      def perform
-        if callback && headers['Content-Type'] =~ /json/i
-          @response = pad
-          headers['Content-Length'] = response.first.length.to_s
-          headers['Content-Type'] = 'application/javascript'
-        end
-        [status, headers, response]
-      end
-
-      private
-      def callback
-        @callback ||= request.params.delete(callback_param)
-      end
-
-      # Pads the response with the appropriate callback format according to the
-      # JSON-P spec/requirements.
-      #
-      # The Rack response spec indicates that it should be enumerable. The method
-      # of combining all of the data into a single string makes sense since JSON
-      # is returned as a full string.
-      #
-      def pad(body = "")
-        response.each {|s| body << s }
-        ["#{callback}({'metadata': #{metadata}, 'data': #{body}})"]
-      end
-
-      def metadata
-        # TODO : add all the non-core HTTP headers
-        {
-          "status" => status
-        }.to_json
-      end
-
-    end
-  end
-end

data/lib/biceps/model_versioning.rb

@@ -1,33 +0,0 @@
-module Biceps
-  module ModelVersioning
-
-    def self.included(klass)
-      klass.class_eval do
-
-        protected
-        alias :old_api_behavior :api_behavior
-        def api_behavior(error)
-          if api_version
-            begin
-              constant = "Serializers::#{resource.class}::V#{api_version}".constantize
-
-              @resource = constant.new(resource)
-            rescue NameError
-              #
-              # The serializer for that version is not defined
-              # Use the model's internal serialize
-              #
-            end
-          end
-
-          old_api_behavior(error)
-        end
-
-        private
-        def api_version
-          Biceps::Parser.new(request).version
-        end
-      end
-    end
-  end
-end

data/lib/biceps/parser.rb

@@ -1,31 +0,0 @@
-module Biceps
-  class Parser
-    attr_accessor :request, :valid_versions
-
-    def initialize(request, valid_versions=nil)
-      @request = request
-      @valid_versions = [valid_versions].flatten
-    end
-
-    def valid?
-      valid_versions.include?(version)
-    end
-
-    def version
-      is_api_call?[1].to_i if is_api_call?
-    end
-
-    private
-    def is_api_call?
-      request.accept.match(regex) if request.accept
-    end
-
-    def regex
-      Regexp.new("application/vnd.#{app_name};ver=([0-9]+)")
-    end
-
-    def app_name
-      Rails.application.class.to_s.split('::').first.underscore
-    end
-  end
-end

data/lib/biceps/serializer.rb

@@ -1,22 +0,0 @@
-module Biceps
-  class Serializer
-    include ActiveModel::Serialization
-    include ActiveModel::Serializers::JSON
-    include ActiveModel::Serializers::Xml
-
-    attr_accessor :parent
-    delegate :respond_to?, :to => :parent
-
-    def initialize(parent)
-      @parent = parent
-    end
-
-    def method_missing(method, *args, &block)
-      if parent.respond_to?(method)
-        parent.send(method, *args, &block)
-      else
-        super
-      end
-    end
-  end
-end