versionist 1.4.0 → 1.4.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTg4MjJiZGQ5OWI2YjE3MTYwMjI5M2E1ODAzMjBmZDViY2E2NGI2OQ==
-  data.tar.gz: !binary |-
-    ODUxODYxMzYyNDM5M2JlMWY1NDVhMzEzYjJmY2U0MTExM2UyZjBmMQ==
+SHA1:
+  metadata.gz: ac9417b318b2984f5b59c1e5185a3eb37010d2da
+  data.tar.gz: 151008740186600e0d303dee3b56a4c20602da65
 SHA512:
-  metadata.gz: !binary |-
-    NjhiMmQwNmYzMjRjY2FlYWM2MDRlYTA3NjRmY2UxYTgzODQxM2M5N2YzNzY2
-    M2IxZmZhMWRlZmQxMGRlMmY2Y2RiZGM5NGEwZjhiNThjMjNkNjA3Y2FhZjZh
-    OGFiYmIzNTE4MGU5ZWMzNWI1ZTQwNTg1ZmE5YmRhODlmNWE2Yzk=
-  data.tar.gz: !binary |-
-    OWM4Y2Q5ZmQ3NGQ2MjhlMmZmNDFmMDY3MjFjY2Y1MTYwYTgzZTJmZWQ5OTBl
-    MTllODY5ODA4MGViMWExNmQxMWZmMWYyM2Q2YTI5NGYyZWYyNTI3ZjI4N2Fm
-    ZGJhMTljY2Y3MmI5ZmQ1MTVlMmI2NjJkM2M4YmI5MzY4MTg2ZDE=
+  metadata.gz: 31276bf69db774daa8853f90abf5feba2fad6303dbcc2a7205294b137c7c4f352f763fb882b5c9e20c719b2a3497db8da00f660a838c26a0ec314bdc64ef2b82
+  data.tar.gz: 4c41d6f1087625412b7e428de21839a8d264a91b61dc012ff3ba23ca528247e34e589e603c9a2a44f45d76130567f256fbed6e510f2491a91a99efc7ad406bfc

data/lib/generators/versionist/new_api_version/new_api_version_generator.rb

@@ -1,6 +1,7 @@
 module Versionist
   class NewApiVersionGenerator < Rails::Generators::Base
     include InflectorFixes
+    include RspecHelper
 
     desc "creates the infrastructure for a new API version"
 
@@ -14,7 +15,6 @@ module Versionist
     class_option :path, :type => :hash, :group => :path
     class_option :defaults, :type => :hash, :group => :defaults
 
-
     def verify_options
       raise "Must specify at least one versioning strategy option" if !['header', 'parameter', 'path'].any? {|strategy| options.has_key?(strategy)}
       if options.has_key?("header")
@@ -69,10 +69,11 @@ module Versionist
           empty_directory "test/integration/#{module_name_for_path(module_name)}"
           template 'base_controller_integration_test.rb', File.join("test", "integration", "#{module_name_for_path(module_name)}", "base_controller_test.rb")
         when :rspec
+          @rspec_require_file = rspec_helper_filename
           empty_directory "spec/controllers/#{module_name_for_path(module_name)}"
-          template 'base_controller_spec.rb', File.join("spec", "controllers", "#{module_name_for_path(module_name)}", "base_controller_spec.rb")
+          template 'base_controller_spec.rb', File.join("spec", "controllers", "#{module_name_for_path(module_name)}", "base_controller_spec.rb"), :assigns => { :rspec_require_file => @rspec_require_file }
           empty_directory "spec/requests/#{module_name_for_path(module_name)}"
-          template 'base_controller_spec.rb', File.join("spec", "requests", "#{module_name_for_path(module_name)}", "base_controller_spec.rb")
+          template 'base_controller_spec.rb', File.join("spec", "requests", "#{module_name_for_path(module_name)}", "base_controller_spec.rb"), :assigns => { :rspec_require_file => @rspec_require_file }
         else
           say "Unsupported test_framework: #{Versionist.configuration.configured_test_framework}"
         end
@@ -93,8 +94,9 @@ module Versionist
           empty_directory "test/presenters/#{module_name_for_path(module_name)}"
           template 'base_presenter_test.rb', File.join("test", "presenters", "#{module_name_for_path(module_name)}", "base_presenter_test.rb")
         when :rspec
+          @rspec_require_file = rspec_helper_filename
           empty_directory "spec/presenters/#{module_name_for_path(module_name)}"
-          template 'base_presenter_spec.rb', File.join("spec", "presenters", "#{module_name_for_path(module_name)}", "base_presenter_spec.rb")
+          template 'base_presenter_spec.rb', File.join("spec", "presenters", "#{module_name_for_path(module_name)}", "base_presenter_spec.rb"), :assigns => { :rspec_require_file => @rspec_require_file }
         else
           say "Unsupported test_framework: #{Versionist.configuration.configured_test_framework}"
         end

data/lib/generators/versionist/new_api_version/templates/base_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require '<%= @rspec_require_file %>'
 
 describe <%= module_name %>::BaseController do
 

data/lib/generators/versionist/new_api_version/templates/base_presenter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require '<%= @rspec_require_file %>'
 
 describe <%= module_name %>::BasePresenter do
 

data/lib/generators/versionist/new_controller/new_controller_generator.rb

@@ -1,6 +1,7 @@
 module Versionist
   class NewControllerGenerator < Rails::Generators::NamedBase
     include InflectorFixes
+    include RspecHelper
 
     desc "creates a new controller for an existing API version"
     source_root File.expand_path('../templates', __FILE__)
@@ -34,8 +35,9 @@ module Versionist
           template 'new_controller_functional_test.rb', File.join("test", "functional", "#{module_name_for_path(module_name)}", "#{file_name}_controller_test.rb")
           template 'new_controller_integration_test.rb', File.join("test", "integration", "#{module_name_for_path(module_name)}", "#{file_name}_controller_test.rb")
         when :rspec
-          template 'new_controller_spec.rb', File.join("spec", "controllers", "#{module_name_for_path(module_name)}", "#{file_name}_controller_spec.rb")
-          template 'new_controller_spec.rb', File.join("spec", "requests", "#{module_name_for_path(module_name)}", "#{file_name}_controller_spec.rb")
+          @rspec_require_file = rspec_helper_filename
+          template 'new_controller_spec.rb', File.join("spec", "controllers", "#{module_name_for_path(module_name)}", "#{file_name}_controller_spec.rb"), :assigns => { :rspec_require_file => @rspec_require_file }
+          template 'new_controller_spec.rb', File.join("spec", "requests", "#{module_name_for_path(module_name)}", "#{file_name}_controller_spec.rb"), :assigns => { :rspec_require_file => @rspec_require_file }
         else
           say "Unsupported test_framework: #{Versionist.configuration.configured_test_framework}"
         end

data/lib/generators/versionist/new_controller/templates/new_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require '<%= @rspec_require_file %>'
 
 describe <%= module_name %>::<%= class_name%>Controller do
 

data/lib/generators/versionist/new_presenter/new_presenter_generator.rb

@@ -1,6 +1,7 @@
 module Versionist
   class NewPresenterGenerator < Rails::Generators::NamedBase
     include InflectorFixes
+    include RspecHelper
 
     desc "creates a new presenter for an existing API version"
     source_root File.expand_path('../templates', __FILE__)
@@ -20,7 +21,8 @@ module Versionist
         when :test_unit
           template 'new_presenter_test.rb', File.join("test", "presenters", "#{module_name_for_path(module_name)}", "#{file_name}_presenter_test.rb")
         when :rspec
-          template 'new_presenter_spec.rb', File.join("spec", "presenters", "#{module_name_for_path(module_name)}", "#{file_name}_presenter_spec.rb")
+          @rspec_require_file = rspec_helper_filename
+          template 'new_presenter_spec.rb', File.join("spec", "presenters", "#{module_name_for_path(module_name)}", "#{file_name}_presenter_spec.rb"), :assigns => { :rspec_require_file => @rspec_require_file }
         else
           say "Unsupported test_framework: #{Versionist.configuration.configured_test_framework}"
         end

data/lib/generators/versionist/new_presenter/templates/new_presenter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require '<%= @rspec_require_file %>'
 
 describe <%= module_name %>::<%= class_name%>Presenter do
 

data/lib/generators/versionist/rspec_helper.rb

@@ -0,0 +1,13 @@
+module Versionist
+  module RspecHelper
+    # Gets the name of the helper file to require in spec files
+    # Accounting for rspec-rails 2 vs rspec-rails 3
+    def rspec_helper_filename
+      if File.exists? "spec/rails_helper.rb"
+        "rails_helper"
+      else
+        "spec_helper"
+      end
+    end
+  end
+end

data/lib/versionist.rb

@@ -5,6 +5,7 @@ module Versionist
 
   autoload :Configuration
   autoload :InflectorFixes, "generators/versionist/inflector_fixes"
+  autoload :RspecHelper, "generators/versionist/rspec_helper"
   autoload :CopyApiVersionGenerator, "generators/versionist/copy_api_version/copy_api_version_generator"
   autoload :NewApiVersionGenerator, "generators/versionist/new_api_version/new_api_version_generator"
   autoload :NewControllerGenerator, "generators/versionist/new_controller/new_controller_generator"

data/lib/versionist/version.rb

@@ -1,3 +1,3 @@
 module Versionist
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/lib/versionist/version.rb~

@@ -0,0 +1,3 @@
+module Versionist
+  VERSION = '1.4.0'
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: versionist
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Brian Ploetz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: A plugin for versioning Rails based RESTful APIs.
@@ -83,12 +83,14 @@ files:
 - lib/generators/versionist/new_presenter/templates/new_presenter.rb
 - lib/generators/versionist/new_presenter/templates/new_presenter_spec.rb
 - lib/generators/versionist/new_presenter/templates/new_presenter_test.rb
+- lib/generators/versionist/rspec_helper.rb
 - lib/versionist.rb
 - lib/versionist/configuration.rb
 - lib/versionist/middleware.rb
 - lib/versionist/railtie.rb
 - lib/versionist/routing.rb
 - lib/versionist/version.rb
+- lib/versionist/version.rb~
 - lib/versionist/versioning_strategy.rb
 - lib/versionist/versioning_strategy/base.rb
 - lib/versionist/versioning_strategy/default.rb
@@ -101,24 +103,24 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: versionist-1.4.0
+summary: versionist-1.4.1
 test_files: []
 has_rdoc: