shortener 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDY1OWIyY2I4YjNiZjViNWQ5YTcxMDM4Nzc3MTlkMmRkOTkxMjhhNQ==
+  data.tar.gz: !binary |-
+    MWIwNjJlNTk3MGVkZWViNjBiY2Y2MjhlM2YwM2Q3ZDcxY2I2MWRiZg==
+SHA512:
+  metadata.gz: !binary |-
+    NTY4YzIwODExNWEyYzQ0YjMxNjc5MmFlMTJmZGE5YjU3YjFiOTkxZjk4YjVh
+    MzkyYmNjZjNlMDZiMzgzNzA2NmVlMmUyZDk2MWVhYTAxMDZmMzZkMjRiYTkz
+    OThiZGJkYTI5MjRiMzczZjg1MGYwYTU2ZTg1YWI1ODc4MmE2ZDQ=
+  data.tar.gz: !binary |-
+    NGY2Mzc4YWM0MGJjNDk0MWZjMDYyMjNhOGM2MGJmYWMxNDg5YjJhMDVlYTgz
+    NDk4ZTY4NjM4YTI1NDdhYTIyZmI3MzY0YjQwNjM2NDk3NjdjOWJjNTA5ZjRl
+    NzhlNGY3YmJlZmEwZjNiY2M4OGI5MDc5Yzk4ZTliNGM4NDZhMDA=

data/.gitignore

@@ -12,3 +12,4 @@ bin/*
 *.swp
 Gemfile.lock
 .rvmrc
+.redcar/*

data/.travis.yml

@@ -0,0 +1,9 @@
+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

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://secure.travis-ci.org/jpmcgrath/shortener.png?branch=master" alt="Build Status" />}[http://travis-ci.org/jpmcgrath/shortener]
+
 = Shortener
 
 Shortener is a Rails Engine Gem that makes it easy to create and interpret shortened URLs on your own domain from within your Rails application. Once installed Shortener will generate, store URLS and "unshorten" shortened URLs for your applications visitors, all whilst collecting basic usage metrics.
@@ -97,6 +99,16 @@ The interceptor supports a few more arguments, see the implementation for detail
 
 Shortener is based on code from Dealush[http://dealush.com], for a bit of backstory to Shortener see this {blog post}[http://jamespmcgrath.com/a-simple-link-shortener-in-rails/].
 
+== In The Wild
+
+Shortener is used in a number of production systems:
+
+{Doorkeeper - An Event Management Tool}[http://www.doorkeeperhq.com/]
+
+{Dealush - A Local shopping Sales Notification Service}[http://dealush.com]
+
+If you are using Shortener in your project and would like to be added to this list, please get in touch!
+
 == Authors
 
 * {James McGrath}[https://github.com/jpmcgrath]

data/app/models/shortener/shortened_url.rb

@@ -29,7 +29,7 @@ class Shortener::ShortenedUrl < ActiveRecord::Base
     # so check the datastore
     cleaned_url = clean_url(orig_url)
     scope = owner ? owner.shortened_urls : self
-    scope.find_or_create_by_url(cleaned_url)
+    scope.where(:url => cleaned_url).first_or_create
   end
 
   # return shortened url on success, nil on failure
@@ -43,13 +43,20 @@ class Shortener::ShortenedUrl < ActiveRecord::Base
 
   private
 
+  # the create method changed in rails 4...
+  if Rails::VERSION::MAJOR >= 4
+    CREATE_METHOD_NAME = "create_record"
+  else
+    CREATE_METHOD_NAME = "create"
+  end
+
   # we'll rely on the DB to make sure the unique key is really unique.
   # if it isn't unique, the unique index will catch this and raise an error
-  def create
+  define_method CREATE_METHOD_NAME do
     count = 0
     begin
       self.unique_key = generate_unique_key
-      super
+      super()
     rescue ActiveRecord::RecordNotUnique, ActiveRecord::StatementInvalid => err
       if (count +=1) < 5
         logger.info("retrying with different unique key")

data/lib/shortener/active_record_extension.rb

@@ -1,5 +1,5 @@
 module Shortener::ActiveRecordExtension
   def has_shortened_urls
-    has_many :shortened_urls, :class_name => ::Shortener::ShortenedUrl, :as => :owner
+    has_many :shortened_urls, :class_name => "::Shortener::ShortenedUrl", :as => :owner
   end
 end

data/lib/shortener/version.rb

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

data/spec/dummy/config/routes.rb

@@ -1,4 +1,4 @@
 Dummy::Application.routes.draw do
-  match '/:id' => "shortener/shortened_urls#show"
+  get '/:id' => "shortener/shortened_urls#show"
   root :to => "application_controller#show"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortener
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - James P. McGrath
@@ -10,52 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70307977503340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70307977503340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70307977519260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307977519260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70307977518620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307977518620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &70307977517720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307977517720
+  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
   shortened URLs on your own domain from within your Rails application. Once installed
   Shortener will generate, store URLS and "unshorten" shortened URLs for your applications
@@ -68,6 +79,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -118,27 +130,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://jamespmcgrath.com/projects/shortener
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: shortener
-rubygems_version: 1.8.17
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Shortener is a Rails Engine that makes it easy to create shortened URLs for
   your rails application.
 test_files: []