docent 0.0.2 → 0.0.3

data/CHANGELOG.markdown

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.0.3
+
+- Update gemspec to support Rails 4.0.
+- Fix generator to properly inject mount in routes.rb.
+- Rework `link_for` method to properly return the correct link, regardless of links' order in the `links` table.
+
 ## 0.0.2
 
 ### Enhancements

data/app/models/docent/link.rb

@@ -7,12 +7,13 @@ module Docent
     end
 
     def self.link_for(controller=nil, action=nil)
-      if link = self.where(controller: controller).
-                where(action: action).
-                first
-        link.url
-      elsif link = self.where(controller: controller).first
-        link.url
+      if (links = self.where(controller: controller).
+                  where(self.arel_table[:action].eq(action)).
+                  where(self.arel_table[:action].not_eq(''))).length > 0
+        links.first.url
+      elsif (links = self.where(controller: controller).
+                     where(self.arel_table[:action].eq(''))).length > 0
+        links.first.url
       else
         Docent.default_link
       end

data/app/views/layouts/docent/application.html.erb

@@ -19,7 +19,6 @@
   <footer>
     Powered by
     <%= link_to 'Docent', 'https://github.com/ruralocity/docent' %>
-    <%= Docent::VERSION %>
   </footer>
 </body>
 </html>

data/lib/docent/version.rb

@@ -1,3 +1,3 @@
 module Docent
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/generators/docent/install/install_generator.rb

@@ -3,12 +3,7 @@ module Docent
     source_root File.expand_path('../templates', __FILE__)
 
     def mount_engine_in_routes_file
-      inject_into_file "config/routes.rb", after: "Rails.application.routes.draw do\n" do <<-'ROUTE'
-
-  mount Docent::Engine => "/docent"
-
-      ROUTE
-      end
+      route 'mount Docent::Engine => "/docent"'
     end
 
     def generate_initializer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docent
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1558384049432058431
+      hash: 1935309215431889989
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1558384049432058431
+      hash: 1935309215431889989
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23