shortener 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDY1OWIyY2I4YjNiZjViNWQ5YTcxMDM4Nzc3MTlkMmRkOTkxMjhhNQ==
-  data.tar.gz: !binary |-
-    MWIwNjJlNTk3MGVkZWViNjBiY2Y2MjhlM2YwM2Q3ZDcxY2I2MWRiZg==
+SHA1:
+  metadata.gz: 02ca1515978d1fd1012c45be1b83e8f32fd54d91
+  data.tar.gz: ddb3d85e34747b7d59269fb39df31edabd0c8076
 SHA512:
-  metadata.gz: !binary |-
-    NTY4YzIwODExNWEyYzQ0YjMxNjc5MmFlMTJmZGE5YjU3YjFiOTkxZjk4YjVh
-    MzkyYmNjZjNlMDZiMzgzNzA2NmVlMmUyZDk2MWVhYTAxMDZmMzZkMjRiYTkz
-    OThiZGJkYTI5MjRiMzczZjg1MGYwYTU2ZTg1YWI1ODc4MmE2ZDQ=
-  data.tar.gz: !binary |-
-    NGY2Mzc4YWM0MGJjNDk0MWZjMDYyMjNhOGM2MGJmYWMxNDg5YjJhMDVlYTgz
-    NDk4ZTY4NjM4YTI1NDdhYTIyZmI3MzY0YjQwNjM2NDk3NjdjOWJjNTA5ZjRl
-    NzhlNGY3YmJlZmEwZjNiY2M4OGI5MDc5Yzk4ZTliNGM4NDZhMDA=
+  metadata.gz: a758441a05b4958c4ffcb0ab57841bb61b9c131febc87893f6f81080c27ec67346bcf9fcc89605137624f4fd51f568fa8e6ae2d16098fe10ee1a287217b93402
+  data.tar.gz: a991afd23aabc9efc4a765fa54ddee03e7902a740fc050b8670b69e053f9daa78f4de490fd0f175d621501149b798e519ece6cf57538d1d797d667d60e89de56

data/.travis.yml

@@ -1,9 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  #- jruby-18mode # JRuby in 1.8 mode # jruby does not build native extensions like the sqlite gem
-  #- jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - 2.0.0
+  - 2.1.0

data/README.rdoc

@@ -47,6 +47,12 @@ Then add to your routes:
 
   match '/:id' => "shortener/shortened_urls#show"
 
+== Initialization
+
+By default, the shortener will generate keys that are 5 characters long. You can change that by specifying the length of the key in the config/initializers/shortener.rb file.
+
+  Shortener.unique_key_length = 6
+
 == Usage
 
 To generate a Shortened URL object for the URL "http://dealush.com" within your controller / models do the following:

data/app/models/shortener/shortened_url.rb

@@ -44,10 +44,17 @@ class Shortener::ShortenedUrl < ActiveRecord::Base
   private
 
   # the create method changed in rails 4...
-  if Rails::VERSION::MAJOR >= 4
-    CREATE_METHOD_NAME = "create_record"
+  CREATE_METHOD_NAME =
+    if Rails::VERSION::MAJOR >= 4
+      # And again in 4.0.6/4.1.2
+      if ((Rails::VERSION::MINOR == 0) && (Rails::VERSION::TINY < 6)) ||
+         ((Rails::VERSION::MINOR == 1) && (Rails::VERSION::TINY < 2))
+        "create_record"
+      else
+        "_create_record"
+      end
   else
-    CREATE_METHOD_NAME = "create"
+    "create"
   end
 
   # we'll rely on the DB to make sure the unique key is really unique.

data/lib/shortener/version.rb

@@ -1,3 +1,3 @@
 module Shortener
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/shortener.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = "> 1.3.6"
   s.add_dependency "rails", ">= 3.0.7"
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "rspec-rails", '~> 2.99.0'
   s.add_development_dependency "shoulda-matchers"
   s.executables = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ ENV["RAILS_ENV"] = "test"
 require 'shortener'
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
-require 'shoulda/matchers/integrations/rspec'
+require 'shoulda/matchers'
 
 Rails.backtrace_cleaner.remove_silencers!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortener
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James P. McGrath
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Shortener is a Rails Engine Gem that makes it easy to create and interpret
@@ -78,8 +78,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -137,17 +137,17 @@ 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: shortener
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Shortener is a Rails Engine that makes it easy to create shortened URLs for