versionist 0.2.3 → 0.2.4

data/lib/versionist/configuration.rb

@@ -16,6 +16,7 @@ module Versionist
       @versioning_strategies.clear
       @default_version = nil
       @header_versions.clear
+      @parameter_versions.clear
     end
   end
 end

data/lib/versionist/routing.rb

@@ -33,10 +33,10 @@ module Versionist
     end
 
     def configure_path(config, &block)
+      config[:path].slice!(0) if config[:path] =~ /^\//
       path = Versionist::VersioningStrategy::Path.new(config)
       # Use the :as option and strip out non-word characters from the path to avoid this:
       # https://github.com/rails/rails/issues/3224
-      config[:path].slice!(0) if config[:path] =~ /^\//
       route_hash = {:module => config[:module], :as => config[:path].gsub(/\W/, '_')}
       route_hash.merge!({:defaults => config[:defaults]}) if config.has_key?(:defaults)
       namespace(config[:path], route_hash, &block)
@@ -53,14 +53,3 @@ module Versionist
     end
   end
 end
-
-# Hook to clear versionist cached data when routes are reloaded
-module Rails
-  class Application #:nodoc:
-    def reload_routes_with_versionist!
-      Versionist.configuration.clear!
-      reload_routes_without_versionist!
-    end
-    alias_method_chain :reload_routes!, :versionist
-  end
-end

data/lib/versionist/version.rb

@@ -1,3 +1,3 @@
 module Versionist
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/lib/versionist/versioning_strategy/base.rb

@@ -10,17 +10,26 @@ module Versionist
         raise ArgumentError, "you must pass a configuration Hash" if config.nil? || !config.is_a?(Hash)
         @config = config
         @config.symbolize_keys!
-        Versionist.configuration.versioning_strategies << self
-        raise ArgumentError, "[VERSIONIST] attempt to set more than one default api version" if !Versionist.configuration.default_version.nil? && @config.has_key?(:default)
         if @config.has_key?(:default)
-          Versionist.configuration.default_version = self
           @default = true
+        else
+          @default = false
+        end
+        if !Versionist.configuration.versioning_strategies.include?(self)
+          raise ArgumentError, "[VERSIONIST] attempt to set more than one default api version" if !Versionist.configuration.default_version.nil? && self.default? && Versionist.configuration.default_version != self
+          Versionist.configuration.versioning_strategies << self
+          Versionist.configuration.default_version = self if self.default?
         end
       end
 
       def default?
         @default
       end
+
+      def ==(other)
+        return false if other.nil? || !other.is_a?(Versionist::VersioningStrategy::Base)
+        return self.config == other.config && self.default? == other.default?
+      end
     end
   end
 end

data/lib/versionist/versioning_strategy/header.rb

@@ -7,9 +7,9 @@ module Versionist
       # - :header the header to inspect
       # - :value the value of the header specifying the version
       def initialize(config)
+        super
         raise ArgumentError, "you must specify :header in the configuration Hash" if !config.has_key?(:header)
         raise ArgumentError, "you must specify :value in the configuration Hash" if !config.has_key?(:value)
-        super
         Versionist.configuration.header_versions << config[:value]
       end
 
@@ -18,6 +18,12 @@ module Versionist
         return ((!header_string.blank? && header_string.include?(config[:value])) ||
                 (self.default? && (Versionist.configuration.header_versions.none? {|v| header_string.include?(v)})))
       end
+
+      def ==(other)
+        super
+        return false if !other.is_a?(Versionist::VersioningStrategy::Header)
+        return config[:header] == other.config[:header] && self.config[:value] == other.config[:value]
+      end
     end
   end
 end

data/lib/versionist/versioning_strategy/parameter.rb

@@ -7,9 +7,9 @@ module Versionist
       # - :parameter the parameter to inspect
       # - :value the value of the parameter specifying the version
       def initialize(config)
+        super
         raise ArgumentError, "you must specify :parameter in the configuration Hash" if !config.has_key?(:parameter)
         raise ArgumentError, "you must specify :value in the configuration Hash" if !config.has_key?(:value)
-        super
         Versionist.configuration.parameter_versions << config[:value]
       end
 
@@ -18,6 +18,12 @@ module Versionist
         return ((!parameter_string.blank? && parameter_string == config[:value]) ||
                 (self.default? && (Versionist.configuration.parameter_versions.none? {|v| parameter_string.include?(v)})))
       end
+
+      def ==(other)
+        super
+        return false if !other.is_a?(Versionist::VersioningStrategy::Parameter)
+        return config[:parameter] == other.config[:parameter] && self.config[:value] == other.config[:value]
+      end
     end
   end
 end

data/lib/versionist/versioning_strategy/path.rb

@@ -7,8 +7,14 @@ module Versionist
       # Creates a new Path VersioningStrategy object. config must contain the following keys:
       # - :path the path prefix containing the version
       def initialize(config)
+        super
         raise ArgumentError, "you must specify :path in the configuration Hash" if !config.has_key?(:path)
+      end
+
+      def ==(other)
         super
+        return false if !other.is_a?(Versionist::VersioningStrategy::Path)
+        return config[:path] == other.config[:path]
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: versionist
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Brian Ploetz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-12 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -105,7 +105,7 @@ rubyforge_project:
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: versionist-0.2.3
+summary: versionist-0.2.4
 test_files: []
 
 has_rdoc: