has_machine_tags 0.1.7 → 0.1.8

data/{gemspec → .gemspec}

@@ -12,7 +12,9 @@ Gem::Specification.new do |s|
   s.description = "This gem implements Flickr's machine tags while still maintaining standard tagging behavior. This allows for more precise tagging as tags can have unlimited contexts provided by combinations of namespaces and predicates. These unlimited contexts also make machine tags ripe for modeling relationships between objects."
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project = 'tagaholic'
-  s.add_development_dependency 'bacon'
-  s.files = Dir.glob(%w[{lib,test,generators}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c}]) + %w{Rakefile gemspec init.rb}
+  s.add_development_dependency 'bacon', '>= 1.1.0'
+  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
+  s.files += Dir.glob('generators/**/*.rb') + ['init.rb']
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
-end
+  s.license = 'MIT'
+end

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.1.8
+* Made Rails3 compatible
+
 == 0.1.7
 * Converted tests to bacon
 * Added proper versioning

data/README.rdoc

@@ -21,7 +21,10 @@ Install as a gem
 
     bash> gem install has_machine_tags
 
-    # add in your environment.rb
+    # with bundler: add in Gemfile
+    gem 'has_machine_tags'
+
+    # without bundler: add in config/environment.rb
     config.gem "has_machine_tags"
 
 Or as a plugin
@@ -133,7 +136,7 @@ these characters are off limit unless used in the machine tag context:
 * Possible add support for other ORM's ie DataMapper.
 * Play friendly with other tagging plugins as needed.
 
-== Issues
+== Bugs/Issues
 Please report them {on github}[http://github.com/cldwalker/has_machine_tags/issues].
 
 == Credits

data/Rakefile

@@ -2,12 +2,12 @@ require 'rake'
 require 'fileutils'
 
 def gemspec
-  @gemspec ||= eval(File.read('gemspec'), binding, 'gemspec')
+  @gemspec ||= eval(File.read('.gemspec'), binding, '.gemspec')
 end
 
 desc "Build the gem"
 task :gem=>:gemspec do
-  sh "gem build gemspec"
+  sh "gem build .gemspec"
   FileUtils.mkdir_p 'pkg'
   FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
 end
@@ -32,4 +32,4 @@ task :test do |t|
   sh 'bacon -q -Ilib -I. test/*_test.rb'
 end
 
-task :default => :test
+task :default => :test

data/lib/has_machine_tags/tag.rb

@@ -1,3 +1,10 @@
-class ::Tag < ActiveRecord::Base #:nodoc:
-  include HasMachineTags::TagMethods
+require 'has_machine_tags/tag_methods'
+
+begin
+  require 'app/models/tag'
+rescue LoadError
+  class ::Tag < ActiveRecord::Base #:nodoc:
+  end
 end
+
+::Tag.send :include, HasMachineTags::TagMethods

data/lib/has_machine_tags/tag_console.rb

@@ -6,13 +6,14 @@ module HasMachineTags
   #   end
   module TagConsole
     def self.included(base) #:nodoc:
+      scope = Rails.version >= '3.0' ? 'scope' : 'named_scope'
       base.class_eval %[
-        named_scope :namespace_counts, :select=>'*, namespace as counter, count(namespace) as count', :group=>"namespace HAVING count(namespace)>=1"
-        named_scope :predicate_counts, :select=>'*, predicate as counter, count(predicate) as count', :group=>"predicate HAVING count(predicate)>=1"
-        named_scope :value_counts, :select=>'*, value as counter, count(value) as count', :group=>"value HAVING count(value)>=1"
-        named_scope :distinct_namespaces, :select=>"distinct namespace"
-        named_scope :distinct_predicates, :select=>"distinct predicate"
-        named_scope :distinct_values, :select=>"distinct value"
+        self.#{scope} :namespace_counts, :select=>'*, namespace as counter, count(namespace) as count', :group=>"namespace HAVING count(namespace)>=1"
+        self.#{scope} :predicate_counts, :select=>'*, predicate as counter, count(predicate) as count', :group=>"predicate HAVING count(predicate)>=1"
+        self.#{scope} :value_counts, :select=>'*, value as counter, count(value) as count', :group=>"value HAVING count(value)>=1"
+        self.#{scope} :distinct_namespaces, :select=>"distinct namespace"
+        self.#{scope} :distinct_predicates, :select=>"distinct predicate"
+        self.#{scope} :distinct_values, :select=>"distinct value"
       ]
       base.extend ClassMethods
     end
@@ -26,4 +27,4 @@ module HasMachineTags
       def values; distinct_values.map(&:value).compact; end
     end
   end
-end
+end

data/lib/has_machine_tags/version.rb

@@ -1,3 +1,3 @@
 module HasMachineTags
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/has_machine_tags.rb

@@ -2,6 +2,8 @@ require 'has_machine_tags/finder'
 require 'has_machine_tags/tag_list'
 require 'has_machine_tags/console'
 require 'has_machine_tags/version'
+require 'has_machine_tags/tag'
+require 'has_machine_tags/tagging'
 
 module HasMachineTags
   def self.included(base) #:nodoc:
@@ -25,11 +27,10 @@ module HasMachineTags
         extend HasMachineTags::Finder
         include HasMachineTags::Console::InstanceMethods if options[:console]
 
-        if respond_to?(:named_scope)
-          named_scope :tagged_with, lambda{ |*args|
-            find_options_for_tagged_with(*args)
-          }
-        end
+        scope_word = Rails.version >= '3.0' ? 'scope' : 'named_scope'
+        send scope_word, :tagged_with, lambda  { |*args|
+          find_options_for_tagged_with(*args)
+        }
       end
       if options[:reverse_has_many]
         model = self.to_s
@@ -83,3 +84,5 @@ module HasMachineTags
   end
   
 end
+
+ActiveRecord::Base.send :include, HasMachineTags if defined?(ActiveRecord::Base)

data/test/deps.rip

@@ -0,0 +1 @@
+bacon >=1.1.0

data/test/test_helper.rb

@@ -1,5 +1,10 @@
-require 'rubygems'
-require 'activerecord'
+require 'active_record'
+begin
+  # for rip
+  require 'initializer'
+rescue LoadError
+  require 'rails'
+end
 require 'bacon'
 require 'has_machine_tags'
 require File.join(File.dirname(__FILE__), '..', 'init')
@@ -23,4 +28,4 @@ end
 class Bacon::Context
   def after_all; yield; end
   def before_all; yield; end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_machine_tags
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -04:00
+date: 2010-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,9 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        version: "0"
+        version: 1.1.0
   type: :development
   version_requirements: *id001
 description: This gem implements Flickr's machine tags while still maintaining standard tagging behavior. This allows for more precise tagging as tags can have unlimited contexts provided by combinations of namespaces and predicates. These unlimited contexts also make machine tags ripe for modeling relationships between objects.
@@ -54,18 +58,19 @@ files:
 - test/schema.rb
 - test/tag_methods_test.rb
 - test/test_helper.rb
-- generators/has_machine_tags_migration/has_machine_tags_migration_generator.rb
-- generators/has_machine_tags_migration/templates/migration.rb
 - LICENSE.txt
 - CHANGELOG.rdoc
 - README.rdoc
+- test/deps.rip
 - Rakefile
-- gemspec
+- .gemspec
+- generators/has_machine_tags_migration/has_machine_tags_migration_generator.rb
+- generators/has_machine_tags_migration/templates/migration.rb
 - init.rb
 has_rdoc: true
 homepage: http://tagaholic.me/has_machine_tags/
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -76,6 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -84,6 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3