yard-activerecord2 0.0.7 → 0.0.8

data/lib/yard-activerecord/associations/base.rb

@@ -4,33 +4,34 @@ require 'active_support/inflector'
 module YARD::Handlers::Ruby::ActiveRecord::Associations
   class Base < YARD::Handlers::Ruby::MethodHandler
     namespace_only
-  
+
     def process
-      object = YARD::CodeObjects::MethodObject.new(namespace, method_name)
-      object.group = "Active Record Associations"
+      group_name = "Active Record Associations"
+      namespace.groups << group_name unless namespace.groups.include? group_name
+
+      object           = YARD::CodeObjects::MethodObject.new(namespace, method_name)
+      object.group     = group_name
       object.docstring = return_description
       object.docstring.add_tag get_tag(:return, '', class_name)
       object.docstring.add_tag get_tag(:see, 'http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html')
       object.dynamic = true
       register object
-      group_name = "Active Record Associations"
-      namespace.groups << group_name unless namespace.groups.include? group_name
     end
-  
+
     private
     def method_name
       call_params[0]
     end
-  
+
     def class_name(singularize = false)
       param_size = statement.parameters.size
       if param_size > 2
-        i = 1
+        i           = 1
         return_this = false
         while i < param_size - 1
           # May want to evaluate doing it this way
-          hash = eval('{' + statement.parameters[i].jump(:hash).source + '}')
-          return hash[:class_name] unless hash[:class_name].nil?
+          statement.parameters[i].jump(:hash).source =~ /(:class_name\s*=>|class_name:)\s*["']([^"']+)["']/
+          return $2 if $2
           i += 1
         end
       end
@@ -40,11 +41,11 @@ module YARD::Handlers::Ruby::ActiveRecord::Associations
         method_name.capitalize
       end
     end
-  
+
     def return_description
       "An array of associated #{method_name}."
     end
-  
+
     def get_tag(tag, text, return_classes = [])
       YARD::Tags::Tag.new(tag, text, [return_classes].flatten)
     end

data/lib/yard-activerecord/delegations/delegate_handler.rb

@@ -8,7 +8,7 @@ module YARD::Handlers::Ruby::ActiveRecord::Delegations
     def process
       params = call_params
       class_name = params.pop
-      class_name = class_name[:to] if class_name.is_a?(Hash) && class_name[:to]
+      class_name = class_name[:to] if class_name.is_a?(Hash)
       class_name.capitalize!
       params.each do |method_name|
         object = YARD::CodeObjects::MethodObject.new(namespace, method_name)

data/lib/yard-activerecord/version.rb

@@ -1,5 +1,5 @@
 module YARD
   module ActiveRecord
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/yard-activerecord.rb

@@ -3,15 +3,18 @@ require 'yard'
 module YARD::Handlers::Ruby::ActiveRecord
 end
 
-require_relative 'yard-activerecord/fields/create_table_handler'
-require_relative 'yard-activerecord/fields/define_handler'
-require_relative 'yard-activerecord/fields/field_handler'
+root = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH << root unless $LOAD_PATH.include? root
 
-require_relative 'yard-activerecord/associations/belongs_to_handler'
-require_relative 'yard-activerecord/associations/has_one_handler'
-require_relative 'yard-activerecord/associations/has_one_handler'
-require_relative 'yard-activerecord/associations/has_and_belongs_to_many_handler'
+require 'yard-activerecord/fields/create_table_handler'
+require 'yard-activerecord/fields/define_handler'
+require 'yard-activerecord/fields/field_handler'
 
-require_relative 'yard-activerecord/delegations/delegate_handler'
+require 'yard-activerecord/associations/belongs_to_handler'
+require 'yard-activerecord/associations/has_one_handler'
+require 'yard-activerecord/associations/has_many_handler'
+require 'yard-activerecord/associations/has_and_belongs_to_many_handler'
 
-require_relative 'yard-activerecord/scopes/scope_handler'
+require 'yard-activerecord/delegations/delegate_handler'
+
+require 'yard-activerecord/scopes/scope_handler'

data/yard-activerecord.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
-require 'YARD'
-require File.dirname(__FILE__) + '/lib/yard-activerecord'
-require File.dirname(__FILE__) + '/lib/yard-activerecord/version'
+$:.push File.expand_path("../lib", __FILE__)
+
+require "yard-activerecord/version"
 
 Gem::Specification.new do |s|
   s.name        = "yard-activerecord2"
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
     attributes, associations, delegates and scopes. A must for any Rails app
     using YARD as documentation plugin. }
 
-  s.add_development_dependency 'yard', '>= 0.7.0'
+  s.add_dependency 'yard', '>= 0.8.3'
 
   s.files         = `git ls-files`.split("\n")
   s.require_path  = "lib"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yard-activerecord2
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -18,15 +18,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
+        version: 0.8.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.3
 description: ! "\n    YARD-Activerecord is a YARD extension that handles and interprets
   methods\n    used when developing applications with ActiveRecord. The extension
   handles\n    attributes, associations, delegates and scopes. A must for any Rails
@@ -42,10 +42,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- lib/.DS_Store
 - lib/yard-activerecord.rb
-- lib/yard-activerecord/.DS_Store
-- lib/yard-activerecord/associations/.DS_Store
 - lib/yard-activerecord/associations/base.rb
 - lib/yard-activerecord/associations/belongs_to_handler.rb
 - lib/yard-activerecord/associations/has_and_belongs_to_many_handler.rb
@@ -53,13 +50,10 @@ files:
 - lib/yard-activerecord/associations/has_one_handler.rb
 - lib/yard-activerecord/associations/plural_handler.rb
 - lib/yard-activerecord/associations/singular_handler.rb
-- lib/yard-activerecord/delegations/.DS_Store
 - lib/yard-activerecord/delegations/delegate_handler.rb
-- lib/yard-activerecord/fields/.DS_Store
 - lib/yard-activerecord/fields/create_table_handler.rb
 - lib/yard-activerecord/fields/define_handler.rb
 - lib/yard-activerecord/fields/field_handler.rb
-- lib/yard-activerecord/scopes/.DS_Store
 - lib/yard-activerecord/scopes/scope_handler.rb
 - lib/yard-activerecord/version.rb
 - test.rb