mack-data_mapper 0.8.2 → 0.8.3

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/repository.rb

@@ -91,6 +91,14 @@ module DataMapper
       "#<DataMapper::Repository:#{@name}>"
     end
 
+    def _dump(*)
+      name.to_s
+    end
+
+    def self._load(marshalled)
+      new(marshalled.to_sym)
+    end
+
     private
 
     def initialize(name)

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/resource.rb

@@ -198,7 +198,7 @@ module DataMapper
       attrs = []
 
       properties.each do |property|
-        value = if property.lazy? && !attribute_loaded?(property.name) && !new_record?
+        value = if !attribute_loaded?(property.name) && !new_record?
           '<not loaded>'
         else
           send(property.getter).inspect
@@ -491,13 +491,13 @@ module DataMapper
     # --
     # @api public
     def attributes=(values_hash)
-      values_hash.each_pair do |k,v|
-        setter = "#{k.to_s.sub(/\?\z/, '')}="
+      values_hash.each do |name, value|
+        name = name.to_s.sub(/\?\z/, '')
 
-        if respond_to?(setter)
-          send(setter, v)
+        if self.class.public_method_defined?(setter = "#{name}=")
+          send(setter, value)
         else
-          raise NameError, "#{setter} is not a public property"
+          raise ArgumentError, "The property '#{name}' is not a public property."
         end
       end
     end
@@ -528,6 +528,19 @@ module DataMapper
       model.to_query(repository, key, query) unless new_record?
     end
 
+    # TODO: add docs
+    # @api private
+    def _dump(*)
+      repository_name = repository.name
+      attributes      = {}
+
+      model.properties(repository_name).slice(*loaded_attributes).compact.each do |property|
+        attributes[property.name] = property.get(self) if property.writer_visibility == :public
+      end
+
+      Marshal.dump([ repository_name, attributes ])
+    end
+
     protected
 
     def properties

data/lib/gems/dm-core-0.9.9/lib/dm-core/version.rb

@@ -0,0 +1,3 @@
+module DataMapper
+  VERSION = '0.9.9' unless defined?(DataMapper::VERSION)
+end

data/lib/gems/{dm-migrations-0.9.7 → dm-migrations-0.9.9}/lib/dm-migrations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   class Migration
-    VERSION = "0.9.7"
+    VERSION = '0.9.9'
   end
 end

data/lib/gems/{dm-migrations-0.9.7 → dm-migrations-0.9.9}/lib/migration.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'dm-core', '~>0.9.7'
+gem 'dm-core', '~>0.9.9'
 require 'dm-core'
 require 'benchmark'
 require File.dirname(__FILE__) + '/sql'
@@ -196,19 +196,21 @@ module DataMapper
 
     # Quoted table name, for the adapter
     def migration_info_table
-      @migration_info_table ||= @adapter.send(:quote_table_name, 'migration_info')
+      @migration_info_table ||= quote_table_name('migration_info')
     end
 
     # Quoted `migration_name` column, for the adapter
     def migration_name_column
-      @migration_name_column ||= @adapter.send(:quote_column_name, 'migration_name')
+      @migration_name_column ||= quote_column_name('migration_name')
     end
 
     def quote_table_name(table_name)
+      # TODO: Fix this for 1.9 - can't use this hack to access a private method
       @adapter.send(:quote_table_name, table_name.to_s)
     end
 
     def quote_column_name(column_name)
+      # TODO: Fix this for 1.9 - can't use this hack to access a private method
       @adapter.send(:quote_column_name, column_name.to_s)
     end
   end

data/lib/gems/dm-migrations-0.9.9/tasks/db.rb

@@ -0,0 +1,22 @@
+namespace :db do
+
+  # pass the relative path to the migrations directory by MIGRATION_DIR
+  task :setup_migration_dir do
+    unless defined?(MIGRATION_DIR)
+      migration_dir = ENV["MIGRATION_DIR"] || File.join("db", "migrations")
+      MIGRATION_DIR = File.expand_path(File.join(File.dirname(__FILE__), migration_dir))
+    end
+    FileUtils.mkdir_p MIGRATION_DIR
+  end
+
+  # set DIRECTION to migrate down
+  desc "Run your system's migrations"
+  task :migrate => [:setup_migration_dir] do
+    require File.expand_path(File.join(File.dirname(__FILE__), "lib", "migration_runner.rb"))
+    require File.expand_path(File.join(MIGRATION_DIR, "config.rb"))
+
+    Dir[File.join(MIGRATION_DIR, "*.rb")].each { |file| require file }
+
+    ENV["DIRECTION"] != "down" ? migrate_up! : migrate_down!
+  end
+end

data/lib/gems/dm-migrations-0.9.9/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/lib/gems/dm-migrations-0.9.9/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

data/lib/gems/{dm-observer-0.9.7 → dm-observer-0.9.9}/lib/dm-observer.rb

@@ -55,7 +55,7 @@ end # DataMapper
 if $0 == __FILE__
   require 'rubygems'
 
-  gem 'dm-core', '~>0.9.7'
+  gem 'dm-core', '~>0.9.9'
   require 'dm-core'
 
   FileUtils.touch(File.join(Dir.pwd, "migration_test.db"))

data/lib/gems/{dm-observer-0.9.7 → dm-observer-0.9.9}/lib/dm-observer/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Observer
-    VERSION = "0.9.7"
+    VERSION = '0.9.9'
   end
 end

data/lib/gems/dm-observer-0.9.9/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/lib/gems/dm-observer-0.9.9/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

data/lib/gems/dm-serializer-0.9.9/lib/dm-serializer.rb

@@ -0,0 +1,4 @@
+require 'dm-serializer/to_json'
+require 'dm-serializer/to_xml'
+require 'dm-serializer/to_yaml'
+require 'dm-serializer/to_csv'

data/lib/gems/dm-serializer-0.9.9/lib/dm-serializer/common.rb

@@ -0,0 +1,24 @@
+module DataMapper
+  module Serialize
+    # Returns propreties to serialize based on :only or :exclude arrays, if provided
+    # :only takes precendence over :exclude
+    #
+    # @return <Array> properties that need to be serialized
+    def properties_to_serialize(options)
+      only_properties     = Array(options[:only])
+      excluded_properties = Array(options[:exclude])
+
+      self.class.properties(repository.name).reject do |p|
+        if only_properties.include? p.name
+          false
+        else
+          excluded_properties.include?(p.name) || !(only_properties.empty? || only_properties.include?(p.name))
+        end
+      end
+    end
+  end
+
+  module Resource
+    include Serialize
+  end
+end

data/lib/gems/dm-serializer-0.9.9/lib/dm-serializer/to_csv.rb

@@ -0,0 +1,35 @@
+require 'dm-serializer/common'
+
+begin
+  gem('fastercsv')
+  require 'faster_csv'
+rescue LoadError
+  nil
+end
+
+module DataMapper
+  module Serialize
+    # Serialize a Resource to comma-separated values (CSV).
+    #
+    # @return <String> a CSV representation of the Resource
+    def to_csv(writer = '')
+      FasterCSV.generate(writer) do |csv|
+        row = []
+        self.class.properties(repository.name).each do |property|
+         row << send(property.name).to_s
+        end
+        csv << row
+      end
+    end
+  end
+
+  class Collection
+    def to_csv
+      result = ""
+      each do |item|
+        result << item.to_csv + "\n"
+      end
+      result
+    end
+  end
+end

data/lib/gems/dm-serializer-0.9.9/lib/dm-serializer/to_json.rb

@@ -0,0 +1,73 @@
+require 'dm-serializer/common'
+
+begin
+  gem('json')
+  require 'json/ext'
+rescue LoadError
+  gem('json_pure')
+  require 'json/pure'
+end
+
+module DataMapper
+  module Serialize
+    # Serialize a Resource to JavaScript Object Notation (JSON; RFC 4627)
+    #
+    # @return <String> a JSON representation of the Resource
+    def to_json(*args)
+      options = args.first || {}
+      result = '{ '
+      fields = []
+
+      propset = properties_to_serialize(options)
+
+      fields += propset.map do |property|
+        "#{property.name.to_json}: #{send(property.getter).to_json}"
+      end
+
+      # add methods
+      (options[:methods] || []).each do |meth|
+        if self.respond_to?(meth)
+          fields << "#{meth.to_json}: #{send(meth).to_json}"
+        end
+      end
+
+      # Note: if you want to include a whole other model via relation, use :methods
+      # comments.to_json(:relationships=>{:user=>{:include=>[:first_name],:methods=>[:age]}})
+      # add relationships
+      # TODO: This needs tests and also needs to be ported to #to_xml and #to_yaml
+      (options[:relationships] || {}).each do |rel,opts|
+        if self.respond_to?(rel)
+          fields << "#{rel.to_json}: #{send(rel).to_json(opts)}"
+        end
+      end
+
+      result << fields.join(', ')
+      result << ' }'
+      result
+    end
+  end
+
+  module Associations
+    # the json gem adds Object#to_json, which breaks the DM proxies, since it
+    # happens *after* the proxy has been blank slated. This code removes the added
+    # method, so it is delegated correctly to the Collection
+    proxies = []
+
+    proxies << ManyToMany::Proxy if defined?(ManyToMany::Proxy)
+    proxies << OneToMany::Proxy  if defined?(OneToMany::Proxy)
+    proxies << ManyToOne::Proxy  if defined?(ManyToOne::Proxy)
+
+    proxies.each do |proxy|
+      if proxy.public_instance_methods.any? { |m| m.to_sym == :to_json }
+        proxy.send(:undef_method, :to_json)
+      end
+    end
+  end
+
+  class Collection
+    def to_json(*args)
+      opts = args.first || {}
+      "[" << map {|e| e.to_json(opts)}.join(",") << "]"
+    end
+  end
+end