@@ -15,8 +15,8 @@ end # Gem require "rake/gempackagetask" -NAME = "beacon" -SUMMARY = "Beacon O/RM" +NAME = "clipper" +SUMMARY = "Clipper O/RM" GEM_VERSION = "0.1.1" spec = Gem::Specification.new do |s| @@ -34,12 +34,12 @@ Rake::GemPackageTask.new(spec) do |pkg| pkg.gem_spec = spec end -desc "Install the Beacon O/RM as a gem" +desc "Install the Clipper O/RM as a gem" task :install => [:repackage] do sh %{gem install pkg/#{NAME}-#{GEM_VERSION}} end -desc "Publish the Beacon O/RM gem" +desc "Publish the Clipper O/RM gem" task :publish do STDOUT.print "Publishing gem... " STDOUT.flush @@ -50,26 +50,26 @@ end desc "Run performance benchmarks" task :perf do if RUBY_PLATFORM =~ /java/ - sh("jruby -r'lib/beacon' script/performance.rb") + sh("jruby -r'lib/clipper' script/performance.rb") else - sh("ruby -r'lib/beacon' script/performance.rb dm") + sh("ruby -r'lib/clipper' script/performance.rb dm") end end desc "Run profiling" task :profile do - sh("jruby -r'lib/beacon' -rprofile script/profile.rb") + sh("jruby -r'lib/clipper' -rprofile script/profile.rb") end namespace :profile do desc "Run profiling for get" task :get do - sh("TARGET=get jruby -r'lib/beacon' script/profile/get.rb") + sh("TARGET=get jruby -r'lib/clipper' script/profile/get.rb") end desc "Run profiling for create" task :create do - sh("TARGET=create jruby -r'lib/beacon' script/profile/create.rb") + sh("TARGET=create jruby -r'lib/clipper' script/profile/create.rb") end end @@ -83,9 +83,9 @@ desc "Compile the native Java code." task :java_compile do puts "Compiling native Java code" pkg_classes = File.join(*%w(pkg classes)) - jar_name = File.join(*%w(lib beacon_internal.jar)) + jar_name = File.join(*%w(lib clipper_internal.jar)) mkdir_p pkg_classes sh "javac -target 1.5 -source 1.5 -Xlint:unchecked -d pkg/classes #{java_classpath_arg} #{FileList['src/java/**/*.java'].join(' ')}" sh "jar cf #{jar_name} -C #{pkg_classes} ." end -file "lib/beacon_internal.jar" => :java_compile \ No newline at end of file +file "lib/clipper_internal.jar" => :java_compile \ No newline at end of file Rakefile @@ -9,55 +9,55 @@ require Pathname(__FILE__).dirname.parent + "wieck" + "assertions" require Pathname(__FILE__).dirname.parent + "wieck" + "blank" require Pathname(__FILE__).dirname.parent + "wieck" + "using" -# require Pathname(__FILE__).dirname.parent + "beacon_internal.jar" +# require Pathname(__FILE__).dirname.parent + "clipper_internal.jar" require Pathname(__FILE__).dirname.parent + "wieck" + "string" -require Pathname(__FILE__).dirname + "beacon" + "uri" +require Pathname(__FILE__).dirname + "clipper" + "uri" -require Pathname(__FILE__).dirname + "beacon" + "model" +require Pathname(__FILE__).dirname + "clipper" + "model" -require Pathname(__FILE__).dirname + "beacon" + "accessors" +require Pathname(__FILE__).dirname + "clipper" + "accessors" -require Pathname(__FILE__).dirname + "beacon" + "type" -require Pathname(__FILE__).dirname + "beacon" + "types" -require Pathname(__FILE__).dirname + "beacon" + "mappings" + "mapping" -require Pathname(__FILE__).dirname + "beacon" + "mappings" + "relation" +require Pathname(__FILE__).dirname + "clipper" + "type" +require Pathname(__FILE__).dirname + "clipper" + "types" +require Pathname(__FILE__).dirname + "clipper" + "mappings" + "mapping" +require Pathname(__FILE__).dirname + "clipper" + "mappings" + "relation" -require Pathname(__FILE__).dirname + "beacon" + "validations" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "validator" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "context" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "validation_result" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "validation_error" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "absence_validator" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "acceptance_validator" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "minimum_length_validator" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "maximum_length_validator" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "within_validator" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "size_validator" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "required_validator" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "format_validator" -require Pathname(__FILE__).dirname + "beacon" + "validations" + "equality_validator" +require Pathname(__FILE__).dirname + "clipper" + "validations" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "validator" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "context" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "validation_result" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "validation_error" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "absence_validator" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "acceptance_validator" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "minimum_length_validator" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "maximum_length_validator" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "within_validator" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "size_validator" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "required_validator" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "format_validator" +require Pathname(__FILE__).dirname + "clipper" + "validations" + "equality_validator" -require Pathname(__FILE__).dirname + "beacon" + "repositories" -require Pathname(__FILE__).dirname + "beacon" + "repositories" + "schema" -require Pathname(__FILE__).dirname + "beacon" + "repositories" + "abstract" +require Pathname(__FILE__).dirname + "clipper" + "repositories" +require Pathname(__FILE__).dirname + "clipper" + "repositories" + "schema" +require Pathname(__FILE__).dirname + "clipper" + "repositories" + "abstract" -require Pathname(__FILE__).dirname + "beacon" + "query" + "query" -require Pathname(__FILE__).dirname + "beacon" + "query" + "expression" -require Pathname(__FILE__).dirname + "beacon" + "query" + "condition" -require Pathname(__FILE__).dirname + "beacon" + "query" + "criteria" +require Pathname(__FILE__).dirname + "clipper" + "query" + "query" +require Pathname(__FILE__).dirname + "clipper" + "query" + "expression" +require Pathname(__FILE__).dirname + "clipper" + "query" + "condition" +require Pathname(__FILE__).dirname + "clipper" + "query" + "criteria" -require Pathname(__FILE__).dirname + "beacon" + "syntax" + "sql" +require Pathname(__FILE__).dirname + "clipper" + "syntax" + "sql" -require Pathname(__FILE__).dirname + "beacon" + "session" -require Pathname(__FILE__).dirname + "beacon" + "collection" -require Pathname(__FILE__).dirname + "beacon" + "identity_map" -require Pathname(__FILE__).dirname + "beacon" + "mappings" -require Pathname(__FILE__).dirname + "beacon" + "schema" -require Pathname(__FILE__).dirname + "beacon" + "session" + "helper" +require Pathname(__FILE__).dirname + "clipper" + "session" +require Pathname(__FILE__).dirname + "clipper" + "collection" +require Pathname(__FILE__).dirname + "clipper" + "identity_map" +require Pathname(__FILE__).dirname + "clipper" + "mappings" +require Pathname(__FILE__).dirname + "clipper" + "schema" +require Pathname(__FILE__).dirname + "clipper" + "session" + "helper" -module Beacon +module Clipper @registrations = {} def self.registrations @@ -65,7 +65,7 @@ module Beacon end def self.open(connection_name, uri) - uri = Beacon::Uri.new(uri) + uri = Clipper::Uri.new(uri) @registrations[connection_name] = uri.driver.new(connection_name, uri) end lib/beacon.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Accessors def self.included(target) lib/beacon/accessors.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Accessors module Serializable lib/beacon/accessors/serializable.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Accessors class TypedAccessor lib/beacon/accessors/typed_accessor.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper class Collection include Enumerable lib/beacon/collection.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper class IdentityMap def initialize @map = java.util.LinkedHashSet.new @@ -8,4 +8,4 @@ module Beacon end end -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/identity_map.rb @@ -1,11 +1,11 @@ -module Beacon +module Clipper class Mappings class UnmappedClassError < StandardError end class UnsupportedTypeError < StandardError def initialize(type) - super("#{type.inspect} is not a registered Beacon::Type (#{Beacon::Types.inspect})") + super("#{type.inspect} is not a registered Clipper::Type (#{Clipper::Types.inspect})") end end @@ -27,7 +27,7 @@ module Beacon end def <<(mapping) - raise ArgumentError.new("Mappings#<< must be passed a Mapping") unless mapping.is_a?(Beacon::Mappings::Mapping) + raise ArgumentError.new("Mappings#<< must be passed a Mapping") unless mapping.is_a?(Clipper::Mappings::Mapping) @mappings[mapping.target] = mapping end @@ -36,7 +36,7 @@ module Beacon end def map(target, mapped_name) - mapping = Beacon::Mappings::Mapping.new(self, target, mapped_name) + mapping = Clipper::Mappings::Mapping.new(self, target, mapped_name) yield mapping self << mapping mapping lib/beacon/mappings.rb @@ -1,9 +1,9 @@ -module Beacon +module Clipper class Mappings class Field def initialize(mapping, name, type, default = nil) - raise ArgumentError.new("Field#mapping must be a Mapping") unless mapping.kind_of?(Beacon::Mappings::Mapping) + raise ArgumentError.new("Field#mapping must be a Mapping") unless mapping.kind_of?(Clipper::Mappings::Mapping) @mapping = mapping raise ArgumentError.new("Field#name must be a String") unless name.is_a?(String) @@ -11,14 +11,14 @@ module Beacon @name = name if type.is_a?(Class) - if defined_type = Beacon::Types[type.to_s] + if defined_type = Clipper::Types[type.to_s] type = defined_type.new else - raise Beacon::Mappings::UnsupportedTypeError.new(type) + raise Clipper::Mappings::UnsupportedTypeError.new(type) end end - raise ArgumentError.new("Field#type must be a Beacon::Type") unless type.is_a?(Beacon::Type) + raise ArgumentError.new("Field#type must be a Clipper::Type") unless type.is_a?(Clipper::Type) @type = type @default = default lib/beacon/mappings/field.rb @@ -1,6 +1,6 @@ require Pathname(__FILE__).dirname + "field" -module Beacon +module Clipper class Mappings class Mapping @@ -72,7 +72,7 @@ module Beacon target.send(:define_method, name) do associated_mapping = mapping.mappings[mapped_name] - criteria = match_criteria.call(self, Beacon::Query::Criteria.new(associated_mapping)) + criteria = match_criteria.call(self, Clipper::Query::Criteria.new(associated_mapping)) __session__.find(associated_mapping, criteria.__options__, criteria.__conditions__).first end @@ -80,8 +80,8 @@ module Beacon target.send(:define_method, "#{name}=") do |object| associated_mapping = mapping.mappings[mapped_name] - mapping_criteria = Beacon::Query::Criteria.new(mapping) - criteria = match_criteria.call(mapping_criteria, Beacon::Query::Criteria.new(associated_mapping)) + mapping_criteria = Clipper::Query::Criteria.new(mapping) + criteria = match_criteria.call(mapping_criteria, Clipper::Query::Criteria.new(associated_mapping)) c = criteria.__conditions__ c.value.field.set(self, c.field.get(object)) @@ -95,7 +95,7 @@ module Beacon target.send(:define_method, name) do associated_mapping = mapping.mappings[mapped_name] - criteria = match_criteria.call(self, Beacon::Query::Criteria.new(associated_mapping)) + criteria = match_criteria.call(self, Clipper::Query::Criteria.new(associated_mapping)) orm.find(associated_mapping, criteria.__options__, criteria.__conditions__) end lib/beacon/mappings/mapping.rb @@ -1,14 +1,14 @@ -module Beacon +module Clipper class Mappings class Relation def initialize(key, reference) # Breaks CPK... - raise ArgumentError.new("Relation#key must be a Beacon::Mappings::Field") unless key.is_a?(Field) + raise ArgumentError.new("Relation#key must be a Clipper::Mappings::Field") unless key.is_a?(Field) @key = key - raise ArgumentError.new("Relation#reference must be a Beacon::Mappings::Field") unless reference.is_a?(Field) + raise ArgumentError.new("Relation#reference must be a Clipper::Mappings::Field") unless reference.is_a?(Field) @reference = reference end lib/beacon/mappings/relation.rb @@ -1,8 +1,8 @@ -module Beacon +module Clipper module Model def self.included(target) - target.send(:extend, Beacon::Session::Helper) + target.send(:extend, Clipper::Session::Helper) end def __session__ lib/beacon/model.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper class Query class Condition def self.gt(field, value) lib/beacon/query/condition.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper class Query class Criteria @@ -6,8 +6,8 @@ module Beacon alias __new__ new def new(mapping) - unless mapping.is_a?(Beacon::Mappings::Mapping) - raise ArgumentError.new("Beacon::Query::Criteria#initialize requires a Beacon::Mappings::Mapping") + unless mapping.is_a?(Clipper::Mappings::Mapping) + raise ArgumentError.new("Clipper::Query::Criteria#initialize requires a Clipper::Mappings::Mapping") end (@mappings ||= {})[mapping] ||= begin @@ -15,7 +15,7 @@ module Beacon field_methods = mapping.fields.map do |field| <<-EOS def #{field.name} - Beacon::Query::Criteria::Field.new(self, self.class.mapping[#{field.name.inspect}]) + Clipper::Query::Criteria::Field.new(self, self.class.mapping[#{field.name.inspect}]) end EOS end.join @@ -50,21 +50,21 @@ module Beacon def limit(size) if !size.is_a?(Integer) || size <= 0 - raise ArgumentError.new("Beacon::Query::Criteria#limit expects a non-zero Integer for the size") + raise ArgumentError.new("Clipper::Query::Criteria#limit expects a non-zero Integer for the size") end @limit = size end def offset(position) if !position.is_a?(Integer) || position < 0 - raise ArgumentError.new("Beacon::Query::Criteria#offset expects a non-negative Integer for the position") + raise ArgumentError.new("Clipper::Query::Criteria#offset expects a non-negative Integer for the position") end @offset = position end def order(*fields) unless fields.all? { |field| field.is_a?(Criteria::Field) } - raise ArgumentError.new("Beacon::Query::Criteria#order expects a list of Criteria::Field objects") + raise ArgumentError.new("Clipper::Query::Criteria#order expects a list of Criteria::Field objects") end @order = fields.map do |proxy| [ proxy.field, proxy.direction ] lib/beacon/query/criteria.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper class Query class Criteria class Field @@ -14,15 +14,15 @@ module Beacon end def eq(value) - @criteria.merge(Beacon::Query::Condition::eq(@field, value)) + @criteria.merge(Clipper::Query::Condition::eq(@field, value)) end def lt(value) - @criteria.merge(Beacon::Query::Condition::lt(@field, value)) + @criteria.merge(Clipper::Query::Condition::lt(@field, value)) end def gt(value) - @criteria.merge(Beacon::Query::Condition::gt(@field, value)) + @criteria.merge(Clipper::Query::Condition::gt(@field, value)) end def desc @@ -42,4 +42,4 @@ module Beacon end # class Field end # class Criteria end # class Query -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/query/criteria/field.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper class Query class Expression def initialize(*values) lib/beacon/query/expression.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper class Query def initialize(mapping, options, conditions) @mapping = mapping lib/beacon/query/query.rb @@ -1,7 +1,7 @@ -module Beacon +module Clipper module Repositories autoload :Jdbc, (Pathname(__FILE__).dirname + "repositories" + "jdbc.rb").to_s end # module Repositories -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/repositories.rb @@ -1,6 +1,6 @@ require Pathname(__FILE__).dirname + "type" -module Beacon +module Clipper module Repositories class Abstract @@ -9,7 +9,7 @@ module Beacon raise ArgumentError.new("Repository name must not be blank") if name.blank? @name = name - raise ArgumentError.new("Repository uri must be a Beacon::Uri") unless uri.is_a?(Beacon::Uri) + raise ArgumentError.new("Repository uri must be a Clipper::Uri") unless uri.is_a?(Clipper::Uri) @uri = uri end @@ -22,7 +22,7 @@ module Beacon end def mappings - Beacon::Mappings[name] + Clipper::Mappings[name] end def save(collection) lib/beacon/repositories/abstract.rb @@ -1,6 +1,6 @@ require Pathname(__FILE__).dirname.parent.parent.parent + "vendor" + "c3p0-0.9.1.2.jar" -module Beacon +module Clipper module Repositories class Jdbc < Abstract @@ -29,7 +29,7 @@ module Beacon end def syntax - @syntax ||= Beacon::Syntax::Sql.new(self) + @syntax ||= Clipper::Syntax::Sql.new(self) end def select(query, session) @@ -50,7 +50,7 @@ module Beacon statement << " LIMIT #{query.limit}" if query.limit statement << " OFFSET #{query.offset}" if query.offset - collection = Beacon::Collection.new(query.mapping, []) + collection = Clipper::Collection.new(query.mapping, []) with_connection do |connection| if query.paramaters.empty? @@ -93,13 +93,13 @@ module Beacon def get_value_from_result_set(results, index, type) case type - when Beacon::Types::Time + when Clipper::Types::Time t = results.getTime(index) Time.local(t.seconds, t.minutes, t.hours, *Time.now.to_a[3..-1]) - when Beacon::Types::Date + when Clipper::Types::Date d = results.getDate(index) Date.new(d.year + 1900, d.month + 1, d.date) - when Beacon::Types::DateTime + when Clipper::Types::DateTime t = results.getTimestamp(index) Time.at(*t.getTime.divmod(1000)).send(:to_datetime) else @@ -115,7 +115,7 @@ module Beacon mapping = collection.mapping fields = mapping.fields - serial_key = mapping.keys.detect { |field| field.type.is_a?(Beacon::Types::Serial) } + serial_key = mapping.keys.detect { |field| field.type.is_a?(Clipper::Types::Serial) } statement = "INSERT INTO #{quote_identifier(collection.mapping.name)} (" statement << fields.map { |field| quote_identifier(field.name) } * ", " @@ -216,7 +216,7 @@ module Beacon end def schema - @schema ||= Beacon::Repositories::Schema.new(self) + @schema ||= Clipper::Repositories::Schema.new(self) end ## @@ -251,24 +251,24 @@ module Beacon def column_definition(field) column_name = quote_identifier(field.name) case field.type - when Beacon::Types::Integer + when Clipper::Types::Integer "#{column_name} INTEGER" - when Beacon::Types::Serial + when Clipper::Types::Serial "#{column_name} #{column_definition_serial(field)}" - when Beacon::Types::Float + when Clipper::Types::Float "#{column_name} #{column_definition_float(field)}" - when Beacon::Types::String + when Clipper::Types::String "#{column_name} #{column_definition_string(field)}" - when Beacon::Types::Text + when Clipper::Types::Text "#{column_name} #{column_definition_text(field)}" - when Beacon::Types::DateTime + when Clipper::Types::DateTime "#{column_name} TIMESTAMP" - when Beacon::Types::Date + when Clipper::Types::Date "#{column_name} DATE" - when Beacon::Types::Time + when Clipper::Types::Time "#{column_name} TIME" else - raise Beacon::UnsupportedTypeError.new(field.type) + raise Clipper::UnsupportedTypeError.new(field.type) end end @@ -293,21 +293,21 @@ module Beacon statement.setNull(index, 4) else case field.type - when Beacon::Types::Integer + when Clipper::Types::Integer statement.setInt(index, value) - when Beacon::Types::Serial + when Clipper::Types::Serial statement.setInt(index, value) - when Beacon::Types::String + when Clipper::Types::String statement.setString(index, value) - when Beacon::Types::Text + when Clipper::Types::Text statement.setString(index, value) - when Beacon::Types::Float + when Clipper::Types::Float statement.setString(index, value.to_s) - when Beacon::Types::Time + when Clipper::Types::Time statement.setTime(index, java.sql.Time.new(value.to_f * 1000)) - when Beacon::Types::Date + when Clipper::Types::Date statement.setDate(index, java.sql.Date.new(Time.local(value.year, value.month, value.day).to_f * 1000)) - when Beacon::Types::DateTime + when Clipper::Types::DateTime case value when Time time = value.utc @@ -318,7 +318,7 @@ module Beacon statement.setTimestamp(index, java.sql.Timestamp.new(time.to_f * 1000)) else - raise Beacon::UnsupportedTypeError.new(field.type) + raise Clipper::UnsupportedTypeError.new(field.type) end end end lib/beacon/repositories/jdbc.rb @@ -1,7 +1,7 @@ require "jdbc/hsqldb" import "org.hsqldb.jdbcDriver" -module Beacon +module Clipper module Repositories class Jdbc class Hsqldb < Jdbc @@ -45,4 +45,4 @@ module Beacon end # class Sqlite end # class Jdbc end # module Repositories -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/repositories/jdbc/hsqldb.rb @@ -1,7 +1,7 @@ require "jdbc/mysql" import "com.mysql.jdbc.Driver" -module Beacon +module Clipper module Repositories class Jdbc class Mysql < Jdbc @@ -16,4 +16,4 @@ module Beacon end # class Sqlite end # class Jdbc end # module Repositories -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/repositories/jdbc/mysql.rb @@ -1,7 +1,7 @@ require "jdbc/sqlite3" import "org.sqlite.JDBC" -module Beacon +module Clipper module Repositories class Jdbc class Sqlite < Jdbc @@ -21,7 +21,7 @@ module Beacon def key_definition(mapping) # If we've already declared a serial column, don't worry about the key definition - return nil if mapping.keys.any? { |field| field.type.is_a?(Beacon::Types::Serial) } + return nil if mapping.keys.any? { |field| field.type.is_a?(Clipper::Types::Serial) } "PRIMARY KEY (#{mapping.keys.map { |field| quote_identifier(field.name) }.join(', ')})" end @@ -46,4 +46,4 @@ module Beacon end # class Sqlite end # class Jdbc end # module Repositories -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/repositories/jdbc/sqlite.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Repositories class Schema def initialize(repository) lib/beacon/repositories/schema.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Repositories class Type def initialize(field) lib/beacon/repositories/type.rb @@ -1,7 +1,7 @@ -module Beacon +module Clipper class Schema def initialize(repository) - @repository = Beacon::registrations[repository] + @repository = Clipper::registrations[repository] end def create(mapped_class) lib/beacon/schema.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper class Session class RepositoryMissingError < StandardError @@ -17,7 +17,7 @@ module Beacon def repository @repository ||= begin - if repository = Beacon::registrations[@repository_name] + if repository = Clipper::registrations[@repository_name] repository else raise RepositoryMissingError.new(@repository_name) @@ -30,7 +30,7 @@ module Beacon end def map(target, mapped_name, &b) - Beacon::Mappings[@repository_name].map(target, mapped_name, &b) + Clipper::Mappings[@repository_name].map(target, mapped_name, &b) end def get(target, *keys) @@ -45,7 +45,7 @@ module Beacon def all(target) mapping = repository.mappings[target] - criteria = Beacon::Query::Criteria.new(mapping) + criteria = Clipper::Query::Criteria.new(mapping) yield(criteria) if block_given? @@ -53,7 +53,7 @@ module Beacon end def find(target, options, conditions) - mapping = target.is_a?(Beacon::Mappings::Mapping) ? target : repository.mappings[target] + mapping = target.is_a?(Clipper::Mappings::Mapping) ? target : repository.mappings[target] repository.select(Query.new(mapping, options, conditions), self) end @@ -68,7 +68,7 @@ module Beacon end def validate(object, context_name = 'default') - Beacon::validate(object, context_name) + Clipper::validate(object, context_name) end def load(object, field) @@ -81,4 +81,4 @@ module Beacon end end # class Session -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/session.rb @@ -1,8 +1,8 @@ -module Beacon +module Clipper class Session module Helper def orm(repository_name = "default") - session = Beacon::Session.new(repository_name) + session = Clipper::Session.new(repository_name) yield session if block_given? session end lib/beacon/session/helper.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Syntax class Sql @@ -43,7 +43,7 @@ module Beacon end def normalize_value(value) - if value.is_a?(Beacon::Mappings::Field) + if value.is_a?(Clipper::Mappings::Field) @repository.quote_identifier("#{value.mapping.name}.#{value.name}") else "?" lib/beacon/syntax/sql.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper class UnsupportedTypeError < StandardError def initialize(type) @@ -9,7 +9,7 @@ module Beacon class Type def self.inherited(target) - Beacon::Types[target.name] = Beacon::Types[target.name.split("::").last] = target + Clipper::Types[target.name] = Clipper::Types[target.name.split("::").last] = target end end lib/beacon/type.rb @@ -1,6 +1,6 @@ require 'date' -module Beacon +module Clipper module Types @types = {} lib/beacon/types.rb @@ -1,7 +1,7 @@ require "uri" require "cgi" -module Beacon +module Clipper class Uri class MissingDriverError < StandardError @@ -32,7 +32,7 @@ module Beacon @options[key] = value.first if key[-2..-1] != "[]" && value.kind_of?(Array) && value.size == 1 end - @driver = uri.scheme.split(/[\:\+]/).compact.inject(Beacon::Repositories) do |c, name| + @driver = uri.scheme.split(/[\:\+]/).compact.inject(Clipper::Repositories) do |c, name| begin c.const_get(name.capitalize) rescue NameError lib/beacon/uri.rb @@ -1,10 +1,10 @@ -module Beacon +module Clipper @validation_context_map = {} def self.constrain(target, context_name, &block) @validation_context_map[context_name] ||= {} - @validation_context_map[context_name][target] = Beacon::Validations::Context.new(target, context_name, &block) + @validation_context_map[context_name][target] = Clipper::Validations::Context.new(target, context_name, &block) end def self.validate(instance, context_name = 'default') @@ -19,4 +19,4 @@ module Beacon end end -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class AbsenceValidator < Validator @@ -14,4 +14,4 @@ module Beacon end end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/absence_validator.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class AcceptanceValidator < Validator @@ -14,4 +14,4 @@ module Beacon end end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/acceptance_validator.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class ValidationFactory @@ -18,7 +18,7 @@ module Beacon end def run(instance) - validation_result = Beacon::Validations::ValidationResult.new + validation_result = Clipper::Validations::ValidationResult.new @validations.each do |validation| validation.call(instance, validation_result) if validation.should_run?(instance) @@ -106,4 +106,4 @@ module Beacon end end -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/context.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class EqualityValidator < Validator @@ -15,4 +15,4 @@ module Beacon end end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/equality_validator.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class FormatValidator < Validator @@ -16,4 +16,4 @@ module Beacon end end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/format_validator.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class MaximumLengthValidator < Validator @@ -15,4 +15,4 @@ module Beacon end end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/maximum_length_validator.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class MinimumLengthValidator < Validator @@ -15,4 +15,4 @@ module Beacon end end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/minimum_length_validator.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class RequiredValidator < Validator @@ -14,4 +14,4 @@ module Beacon end end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/required_validator.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class SizeValidator < Validator @@ -23,4 +23,4 @@ module Beacon end end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/size_validator.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class ValidationError @@ -12,4 +12,4 @@ module Beacon end # class ValidationError end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/validation_error.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class ValidationResult @@ -31,4 +31,4 @@ module Beacon end # class ValidationResult end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/validation_result.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class Validator lib/beacon/validations/validator.rb @@ -1,4 +1,4 @@ -module Beacon +module Clipper module Validations class WithinValidator < Validator @@ -23,4 +23,4 @@ module Beacon end end # module Validations -end # module Beacon \ No newline at end of file +end # module Clipper \ No newline at end of file lib/beacon/validations/within_validator.rb @@ -3,21 +3,21 @@ # This just creates a "people" table in Sqlite3 and adds a few records for you to play with. require "pathname" -require Pathname(__FILE__).dirname.parent + "lib" + "beacon" +require Pathname(__FILE__).dirname.parent + "lib" + "clipper" sqlite_path = Pathname(__FILE__).dirname.expand_path + "sqlite.db" -@uri = Beacon::Uri.new("jdbc:sqlite://#{sqlite_path}") -Beacon::open("default", @uri.to_s) +@uri = Clipper::Uri.new("jdbc:sqlite://#{sqlite_path}") +Clipper::open("default", @uri.to_s) class Person - Beacon::Mappings["default"].map(self, "people") do |people| - people.key people.field("id", Beacon::Types::Serial) + Clipper::Mappings["default"].map(self, "people") do |people| + people.key people.field("id", Clipper::Types::Serial) people.field "name", String - people.field "gpa", Beacon::Types::Float(7, 2) + people.field "gpa", Clipper::Types::Float(7, 2) end end -$schema = Beacon::Schema.new("default") +$schema = Clipper::Schema.new("default") $schema.create(Person) mike = Person.new script/console @@ -11,7 +11,7 @@ if ORM == "dm" else require 'java' $CLASSPATH << File.dirname(__FILE__) - require Pathname(__FILE__).dirname.parent + "lib" + "beacon" + require Pathname(__FILE__).dirname.parent + "lib" + "clipper" end gem 'faker', '~>0.3.1' @@ -23,7 +23,7 @@ if ORM == "dm" property :id, Serial property :name, String - property :gpa, Beacon::Types::Float(7, 2) + property :gpa, Clipper::Types::Float(7, 2) end case ADAPTER @@ -33,19 +33,19 @@ if ORM == "dm" Person.auto_migrate! else case ADAPTER - when "sqlite" then Beacon::open("default", "jdbc:hsqldb:mem:test") - when "mysql" then Beacon::open("default", "jdbc:mysql://localhost:3306/dm_worm_performance?user=root") + when "sqlite" then Clipper::open("default", "jdbc:hsqldb:mem:test") + when "mysql" then Clipper::open("default", "jdbc:mysql://localhost:3306/dm_worm_performance?user=root") end class Person - Beacon::Mappings["default"].map(self, "people") do |people| - people.key people.field("id", Beacon::Types::Serial) + Clipper::Mappings["default"].map(self, "people") do |people| + people.key people.field("id", Clipper::Types::Serial) people.field("name", String) - people.field("gpa", Beacon::Types::Float(7, 2)) + people.field("gpa", Clipper::Types::Float(7, 2)) end end - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.destroy(Person) rescue nil schema.create(Person) end @@ -84,7 +84,7 @@ Benchmark.bmbm do |x| if ORM == "dm" repository.create(people) else - orm.save(Beacon::Collection.new(Beacon::Mappings["default"].mappings[Person], people)) + orm.save(Clipper::Collection.new(Clipper::Mappings["default"].mappings[Person], people)) end end @@ -108,7 +108,7 @@ Benchmark.bmbm do |x| if ORM == "dm" 1.upto(TIMES) { Person.all(:id.lt => 10).entries } else - conditions = Beacon::Query::Condition.lt(Beacon::Mappings["default"].mappings[Person]["id"], 10) + conditions = Clipper::Query::Condition.lt(Clipper::Mappings["default"].mappings[Person]["id"], 10) orm { |session| 1.upto(TIMES) { session.all(Person, conditions) } } end end script/performance.rb @@ -1,22 +1,22 @@ -Beacon::open("default", "jdbc:hsqldb:mem:test") +Clipper::open("default", "jdbc:hsqldb:mem:test") TIMES = (ENV["x"] || 500).to_i class Person - Beacon::Mappings["default"].map(self, "people") do |people| - people.key people.field("id", Beacon::Types::Serial) + Clipper::Mappings["default"].map(self, "people") do |people| + people.key people.field("id", Clipper::Types::Serial) people.field("name", String) - people.field("gpa", Beacon::Types::Float(7, 2)) + people.field("gpa", Clipper::Types::Float(7, 2)) end end -schema = Beacon::Schema.new("default") +schema = Clipper::Schema.new("default") schema.destroy(Person) rescue nil schema.create(Person) session = orm -people = Beacon::Collection.new(session.mappings[Person], (1..TIMES).map do +people = Clipper::Collection.new(session.mappings[Person], (1..TIMES).map do person = Person.new person.name = "John Doe" person.gpa = "#{rand(4)}.#{rand(9)}".to_f script/profile.rb @@ -1,21 +1,21 @@ -Beacon::open("default", "jdbc:hsqldb:mem:test") +Clipper::open("default", "jdbc:hsqldb:mem:test") TIMES = (ENV["x"] || 1000).to_i class Person - Beacon::Mappings["default"].map(self, "people") do |people| - people.key people.field("id", Beacon::Types::Serial) + Clipper::Mappings["default"].map(self, "people") do |people| + people.key people.field("id", Clipper::Types::Serial) people.field("name", String) - people.field("gpa", Beacon::Types::Float(7, 2)) + people.field("gpa", Clipper::Types::Float(7, 2)) end end -schema = Beacon::Schema.new("default") +schema = Clipper::Schema.new("default") schema.create(Person) case ENV["TARGET"] when "get", "all" - people = Beacon::Collection.new(Beacon::Mappings["default"].mappings[Person], (1..1000).map do + people = Clipper::Collection.new(Clipper::Mappings["default"].mappings[Person], (1..1000).map do person = Person.new person.name = "John Doe" person.gpa = "#{rand(4)}.#{rand(9)}".to_f script/profile/setup.rb @@ -4,7 +4,7 @@ require "java" $CLASSPATH << File.dirname(__FILE__) -require Pathname(__FILE__).dirname.parent + "lib" + "beacon" +require Pathname(__FILE__).dirname.parent + "lib" + "clipper" module Integration end \ No newline at end of file tests/helper.rb @@ -3,22 +3,22 @@ require Pathname(__FILE__).dirname.parent.parent + "helper" class BelongsToTest < Test::Unit::TestCase - include Beacon::Session::Helper + include Clipper::Session::Helper class Zoo - include Beacon::Model + include Clipper::Model orm.map(self, "zoos") do |zoos| - zoos.key(zoos.field("id", Beacon::Types::Serial)) + zoos.key(zoos.field("id", Clipper::Types::Serial)) end end class Exhibit - include Beacon::Model + include Clipper::Model orm.map(self, "exhibits") do |exhibits| - exhibits.key(exhibits.field("id", Beacon::Types::Serial)) - exhibits.field("zoo_id", Beacon::Types::Integer) + exhibits.key(exhibits.field("id", Clipper::Types::Serial)) + exhibits.field("zoo_id", Clipper::Types::Integer) exhibits.belong_to('zoo', Zoo) do |exhibit, zoo| zoo.id.eq(exhibit.zoo_id) @@ -27,9 +27,9 @@ class BelongsToTest < Test::Unit::TestCase end def setup - Beacon::open("default", "jdbc:hsqldb:mem:test") + Clipper::open("default", "jdbc:hsqldb:mem:test") - @schema = Beacon::Schema.new("default") + @schema = Clipper::Schema.new("default") @schema.create(Zoo) @schema.create(Exhibit) @@ -44,7 +44,7 @@ class BelongsToTest < Test::Unit::TestCase def teardown @schema.destroy(Zoo) @schema.destroy(Exhibit) - Beacon::close("default") + Clipper::close("default") end def test_proxy_defines_getter_on_object tests/integration/associations/belongs_to_test.rb @@ -3,17 +3,17 @@ require Pathname(__FILE__).dirname.parent + "helper" class Integration::CollectionTest < Test::Unit::TestCase - include Beacon::Session::Helper + include Clipper::Session::Helper def setup - @uri = Beacon::Uri.new("abstract://localhost/example") - Beacon::open("example", @uri.to_s) + @uri = Clipper::Uri.new("abstract://localhost/example") + Clipper::open("example", @uri.to_s) @person = Class.new do - Beacon::Mappings["example"].map(self, "people") do |people| - people.key people.field("id", Beacon::Types::Serial) - people.field "name", Beacon::Types::String.new(200) - people.field "gpa", Beacon::Types::Float(7, 2) + Clipper::Mappings["example"].map(self, "people") do |people| + people.key people.field("id", Clipper::Types::Serial) + people.field "name", Clipper::Types::String.new(200) + people.field "gpa", Clipper::Types::Float(7, 2) end end @@ -21,10 +21,10 @@ class Integration::CollectionTest < Test::Unit::TestCase end def teardown - Beacon::close("example") + Clipper::close("example") end def test_should_have_an_indexer - assert_equal(1, Beacon::Collection.new(@mapping, [1])[0]) + assert_equal(1, Clipper::Collection.new(@mapping, [1])[0]) end end \ No newline at end of file tests/integration/collection_test.rb @@ -3,16 +3,16 @@ require Pathname(__FILE__).dirname.parent + "helper" class Integration::CriteriaTest < Test::Unit::TestCase - include Beacon::Session::Helper + include Clipper::Session::Helper def setup - @uri = Beacon::Uri.new("abstract://localhost/example") - Beacon::open("example", @uri.to_s) + @uri = Clipper::Uri.new("abstract://localhost/example") + Clipper::open("example", @uri.to_s) @person = Class.new do - Beacon::Mappings["example"].map(self, "people") do |people| - people.key people.field("id", Beacon::Types::Serial) - people.field "name", Beacon::Types::String.new(200) - people.field "gpa", Beacon::Types::Float(7, 2) + Clipper::Mappings["example"].map(self, "people") do |people| + people.key people.field("id", Clipper::Types::Serial) + people.field "name", Clipper::Types::String.new(200) + people.field "gpa", Clipper::Types::Float(7, 2) end end @@ -20,11 +20,11 @@ class Integration::CriteriaTest < Test::Unit::TestCase end def teardown - Beacon::close("example") + Clipper::close("example") end def test_options_do_not_have_side_effects_on_conditions - people = Beacon::Query::Criteria.new(@mapping) + people = Clipper::Query::Criteria.new(@mapping) assert_nothing_raised do people.limit 3 people.order(people.gpa.desc, people.name) tests/integration/criteria_test.rb @@ -4,11 +4,11 @@ require Pathname(__FILE__).dirname.parent + "helper" class Integration::MappingTest < Test::Unit::TestCase def setup - Beacon::open("default", "abstract://localhost/example") + Clipper::open("default", "abstract://localhost/example") end def teardown - Beacon::registrations.delete("default") + Clipper::registrations.delete("default") end # This test describes the internal mappings use by the Wheels O/RM. @@ -23,7 +23,7 @@ class Integration::MappingTest < Test::Unit::TestCase # mail server, web-service or other such storage provider. # The "people" Mapping here would map to the "people" table in our database. - people = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, Class.new, "people") + people = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, Class.new, "people") # The fields in our mappings are added to an ordered-set. This means their order # is deterministic, and should reflect the same order as the underlying schema @@ -38,8 +38,8 @@ class Integration::MappingTest < Test::Unit::TestCase # isn't necessarily directly related to the type returned by a loaded object's # mapped accessor, this information is simply used to optimize how values are stored # and provide some flexibility in mapping them uniformally to objects. - age = people.field "age", Beacon::Types::Integer - marital_status = people.field "marital_status", Beacon::Types::Integer + age = people.field "age", Clipper::Types::Integer + marital_status = people.field "marital_status", Clipper::Types::Integer # Typically we would want our keys to appear first in our mappings, but we needed # to talk about fields first. @@ -54,12 +54,12 @@ class Integration::MappingTest < Test::Unit::TestCase # Field object, we can define our mappings and set the keys in the same step as the # code below, or we could define them separately like so: # - # first_name = people.field("first_name", Beacon::Repositories::Types::String) - # last_name = people.field("last_name", Beacon::Repositories::Types::String) + # first_name = people.field("first_name", Clipper::Repositories::Types::String) + # last_name = people.field("last_name", Clipper::Repositories::Types::String) # people.key(first_name, last_name) people.key( - people.field("first_name", Beacon::Types::String.new(200)), - people.field("last_name", Beacon::Types::String.new(200)) + people.field("first_name", Clipper::Types::String.new(200)), + people.field("last_name", Clipper::Types::String.new(200)) ) # Alternatively, if you want just one field, you can use the Mapping#[] method to @@ -67,12 +67,12 @@ class Integration::MappingTest < Test::Unit::TestCase assert_equal(people["age"], age) # Adding an already defined field will result in a DuplicateFieldError. - assert_raise(Beacon::Mappings::Mapping::DuplicateFieldError) do - people.field("age", Beacon::Types::Integer) + assert_raise(Clipper::Mappings::Mapping::DuplicateFieldError) do + people.field("age", Clipper::Types::Integer) end # A Mapping should have one (and only one) key defined. - assert_raise(Beacon::Mappings::Mapping::MultipleKeyError) do + assert_raise(Clipper::Mappings::Mapping::MultipleKeyError) do people.key(people["age"]) end end tests/integration/mapping_test.rb @@ -3,23 +3,23 @@ require Pathname(__FILE__).dirname.parent + "helper" class Integration::ModelTest < Test::Unit::TestCase - include Beacon::Session::Helper + include Clipper::Session::Helper class Zoo - include Beacon::Model + include Clipper::Model orm.map(self, "zoos") do |zoos| zoos.key "id", Integer - zoos.field "name", Beacon::Types::String.new(200) + zoos.field "name", Clipper::Types::String.new(200) end end def setup - Beacon.open("default", "jdbc:hsqldb://#{Pathname(__FILE__).dirname.expand_path + "sqlite.db"}") + Clipper.open("default", "jdbc:hsqldb://#{Pathname(__FILE__).dirname.expand_path + "sqlite.db"}") end def teardown - Beacon.close("default") + Clipper.close("default") end def test_new_record tests/integration/model_test.rb @@ -4,35 +4,35 @@ require Pathname(__FILE__).dirname.parent + "helper" class RelationTest < Test::Unit::TestCase def setup - @authors = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, Class.new, "authors") - @authors.key(@authors.field "id", Beacon::Types::Integer) + @authors = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, Class.new, "authors") + @authors.key(@authors.field "id", Clipper::Types::Integer) - @stories = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, Class.new, "stories") - @stories.key(@stories.field "id", Beacon::Types::Integer) - @stories.field "author_id", Beacon::Types::Integer + @stories = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, Class.new, "stories") + @stories.key(@stories.field "id", Clipper::Types::Integer) + @stories.field "author_id", Clipper::Types::Integer end def test_requires_two_arguments - assert_equal(Beacon::Mappings::Relation.instance_method("initialize").arity, 2) + assert_equal(Clipper::Mappings::Relation.instance_method("initialize").arity, 2) end def test_has_a_target_and_reference - relation = Beacon::Mappings::Relation.new(@authors["id"], @stories["author_id"]) + relation = Clipper::Mappings::Relation.new(@authors["id"], @stories["author_id"]) assert_equal(relation.key, @authors["id"]) assert_equal(relation.reference, @stories["author_id"]) end def test_only_accepts_fields assert_nothing_raised do - Beacon::Mappings::Relation.new(@authors["id"], @stories["author_id"]) + Clipper::Mappings::Relation.new(@authors["id"], @stories["author_id"]) end assert_raise(ArgumentError) do - Beacon::Mappings::Relation.new(nil, nil) + Clipper::Mappings::Relation.new(nil, nil) end assert_raise(ArgumentError) do - Beacon::Mappings::Relation.new("id", "author_id") + Clipper::Mappings::Relation.new("id", "author_id") end end tests/integration/relation_test.rb @@ -3,49 +3,49 @@ module Integration::AbstractRepositoryTest # class Zoo # end - include Beacon::Session::Helper + include Clipper::Session::Helper def setup_abstract @zoo = Class.new do - Beacon::Mappings["default"].map(self, "zoos") do |zoos| - zoos.key zoos.field("id", Beacon::Types::Serial) - zoos.field "name", Beacon::Types::String.new(200) - zoos.field "city", Beacon::Types::String.new(200) - zoos.field "state", Beacon::Types::String.new(200) - zoos.field "notes", Beacon::Types::Text + Clipper::Mappings["default"].map(self, "zoos") do |zoos| + zoos.key zoos.field("id", Clipper::Types::Serial) + zoos.field "name", Clipper::Types::String.new(200) + zoos.field "city", Clipper::Types::String.new(200) + zoos.field "state", Clipper::Types::String.new(200) + zoos.field "notes", Clipper::Types::Text end end @climate = Class.new do - Beacon::Mappings["default"].map(self, "climates") do |climates| - climates.field("region", Beacon::Types::String.new(200)) - climates.field("climate", Beacon::Types::String.new(200)) + Clipper::Mappings["default"].map(self, "climates") do |climates| + climates.field("region", Clipper::Types::String.new(200)) + climates.field("climate", Clipper::Types::String.new(200)) climates.key(climates["region"]) end end @city = Class.new do - Beacon::Mappings["default"].map(self, "cities") do |cities| - cities.field("name", Beacon::Types::String.new(200)) - cities.field("state", Beacon::Types::String.new(200)) - cities.field("region", Beacon::Types::String.new(200)) + Clipper::Mappings["default"].map(self, "cities") do |cities| + cities.field("name", Clipper::Types::String.new(200)) + cities.field("state", Clipper::Types::String.new(200)) + cities.field("region", Clipper::Types::String.new(200)) cities.key(cities["name"], cities["state"]) end end @person = Class.new do - Beacon::Mappings["default"].map(self, "people") do |people| - people.key people.field("id", Beacon::Types::Serial) - people.field "name", Beacon::Types::String.new(200) - people.field "gpa", Beacon::Types::Float(7, 2) + Clipper::Mappings["default"].map(self, "people") do |people| + people.key people.field("id", Clipper::Types::Serial) + people.field "name", Clipper::Types::String.new(200) + people.field "gpa", Clipper::Types::Float(7, 2) end end @article = Class.new do - Beacon::Mappings["default"].map(self, "articles") do |articles| - articles.field("id", Beacon::Types::Serial) + Clipper::Mappings["default"].map(self, "articles") do |articles| + articles.field("id", Clipper::Types::Serial) articles.field("time", Time) articles.field("date", Date) articles.field("datetime", DateTime) @@ -55,7 +55,7 @@ module Integration::AbstractRepositoryTest end def test_schema_create - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") assert(!schema.exists?(@zoo)) assert_nothing_raised do schema.create(@zoo) @@ -66,12 +66,12 @@ module Integration::AbstractRepositoryTest end def test_schema_exists - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") assert(!schema.exists?(@city)) end def test_schema_destroy - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@zoo) assert_nothing_raised do schema.destroy(@zoo) @@ -79,7 +79,7 @@ module Integration::AbstractRepositoryTest end def test_field_exists - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@city) orm.repository.with_connection do |connection| columns = connection.getMetaData.getColumns(nil, nil, "cities", "state") @@ -90,7 +90,7 @@ module Integration::AbstractRepositoryTest end def test_save_object - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@zoo) zoo = @zoo.new zoo.name = "Dallas" @@ -103,7 +103,7 @@ module Integration::AbstractRepositoryTest end def test_support_for_floats - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") assert_nothing_raised { schema.create(@person) } person = @person.new person.gpa = 3.5 @@ -118,7 +118,7 @@ module Integration::AbstractRepositoryTest end def test_support_for_date_and_time_fields - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") assert_nothing_raised { schema.create(@article) } assert(schema.exists?(@article)) @@ -143,7 +143,7 @@ module Integration::AbstractRepositoryTest end def test_insert_multiple_records - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@person) person1 = @person.new @@ -152,7 +152,7 @@ module Integration::AbstractRepositoryTest person2 = @person.new person2.name = "Jane" - people = Beacon::Collection.new(Beacon::Mappings["default"][@person], [person1, person2]) + people = Clipper::Collection.new(Clipper::Mappings["default"][@person], [person1, person2]) orm.save(people) @@ -163,7 +163,7 @@ module Integration::AbstractRepositoryTest end def test_get_object - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@person) person = @person.new @@ -182,7 +182,7 @@ module Integration::AbstractRepositoryTest end def test_get_object_with_compound_key - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@city) city = @city.new @@ -202,7 +202,7 @@ module Integration::AbstractRepositoryTest end def test_find - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@person) person = @person.new @@ -225,7 +225,7 @@ module Integration::AbstractRepositoryTest end def test_find_with_conditions - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@person) person = @person.new @@ -239,7 +239,7 @@ module Integration::AbstractRepositoryTest orm.save(person) assert_nothing_raised do - low_gpa = Beacon::Query::Condition.lt(Beacon::Mappings["default"][@person]["gpa"], 3) + low_gpa = Clipper::Query::Condition.lt(Clipper::Mappings["default"][@person]["gpa"], 3) people = orm.find(@person, nil, low_gpa) assert_equal(1, people.size) end @@ -249,7 +249,7 @@ module Integration::AbstractRepositoryTest end def test_all_with_single_condition - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@person) bob = @person.new @@ -266,7 +266,7 @@ module Integration::AbstractRepositoryTest end def test_all_with_multiple_conditions - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@person) jimmy = @person.new @@ -286,7 +286,7 @@ module Integration::AbstractRepositoryTest end def test_all_with_limit_and_order - schema = Beacon::Schema.new("default") + schema = Clipper::Schema.new("default") schema.create(@person) mike = @person.new tests/integration/repositories/abstract.rb @@ -7,19 +7,19 @@ class Integration::HsqldbTest < Test::Unit::TestCase include Integration::AbstractRepositoryTest def setup - @uri = Beacon::Uri.new("jdbc:hsqldb:mem:test") + @uri = Clipper::Uri.new("jdbc:hsqldb:mem:test") - Beacon::open("default", @uri.to_s) + Clipper::open("default", @uri.to_s) setup_abstract end def teardown - Beacon::registrations.delete("default") + Clipper::registrations.delete("default") end def test_connection_works - Beacon::registrations["default"].with_connection do |connection| + Clipper::registrations["default"].with_connection do |connection| assert_equal(false, connection.getMetaData.supportsGetGeneratedKeys) end end tests/integration/repositories/hsqldb_test.rb @@ -7,19 +7,19 @@ class Integration::MysqlTest < Test::Unit::TestCase include Integration::AbstractRepositoryTest def setup - @uri = Beacon::Uri.new("jdbc:mysql://localhost:3306/worm_test?user=root") + @uri = Clipper::Uri.new("jdbc:mysql://localhost:3306/worm_test?user=root") - Beacon::open("default", @uri.to_s) + Clipper::open("default", @uri.to_s) setup_abstract end def teardown - Beacon::registrations.delete("default") + Clipper::registrations.delete("default") end def test_connection_works - Beacon::registrations["default"].with_connection do |connection| + Clipper::registrations["default"].with_connection do |connection| assert_equal(true, connection.getMetaData.supportsGetGeneratedKeys) end end tests/integration/repositories/mysql_test.rb @@ -8,20 +8,20 @@ class Integration::SqliteTest < Test::Unit::TestCase def setup @sqlite_path = Pathname(__FILE__).dirname.expand_path + "sqlite.db" - @uri = Beacon::Uri.new("jdbc:sqlite://#{@sqlite_path}") + @uri = Clipper::Uri.new("jdbc:sqlite://#{@sqlite_path}") - Beacon::open("default", @uri.to_s) + Clipper::open("default", @uri.to_s) setup_abstract end def teardown - Beacon::registrations.delete("default") + Clipper::registrations.delete("default") File.unlink(@sqlite_path) rescue nil end def test_get_driver_from_uri - assert_equal(Beacon::Repositories::Jdbc::Sqlite, @uri.driver) + assert_equal(Clipper::Repositories::Jdbc::Sqlite, @uri.driver) end def test_connecting_should_create_database @@ -31,12 +31,12 @@ class Integration::SqliteTest < Test::Unit::TestCase end def test_has_a_syntax - assert_kind_of(Beacon::Syntax::Sql, Beacon::registrations["default"].syntax) + assert_kind_of(Clipper::Syntax::Sql, Clipper::registrations["default"].syntax) end def test_schema_raises_for_unmapped_classes - schema = Beacon::Schema.new("default") - assert_raise(Beacon::Mappings::UnmappedClassError) { schema.create(Class.new) } + schema = Clipper::Schema.new("default") + assert_raise(Clipper::Mappings::UnmappedClassError) { schema.create(Class.new) } end end \ No newline at end of file tests/integration/repositories/sqlite_test.rb @@ -4,47 +4,47 @@ require Pathname(__FILE__).dirname.parent + "helper" class RepositoryTest < Test::Unit::TestCase def setup - @uri = Beacon::Uri.new("abstract://localhost/example") + @uri = Clipper::Uri.new("abstract://localhost/example") end def teardown - Beacon::registrations.delete("example") + Clipper::registrations.delete("example") end def test_requires_two_arguments - assert_equal(2, Beacon::Repositories::Abstract.instance_method("initialize").arity) + assert_equal(2, Clipper::Repositories::Abstract.instance_method("initialize").arity) end def test_has_a_name_and_uri - repository = Beacon::Repositories::Abstract.new("example", @uri) + repository = Clipper::Repositories::Abstract.new("example", @uri) assert_equal("example", repository.name) assert_equal(@uri, repository.uri) end def test_registering_a_repository - repository = Beacon::open("example", @uri.to_s) - assert_kind_of(Beacon::Repositories::Abstract, repository) - assert_equal(1, Beacon::registrations.size) + repository = Clipper::open("example", @uri.to_s) + assert_kind_of(Clipper::Repositories::Abstract, repository) + assert_equal(1, Clipper::registrations.size) end def test_retrieving_a_mapping_for_an_instance - repository = Beacon::open("example", @uri.to_s) + repository = Clipper::open("example", @uri.to_s) person = Class.new do attr_accessor :name, :age - Beacon::Mappings["example"].map(self, "people") do |people| - people.field "name", Beacon::Types::String.new(200) - people.field "age", Beacon::Types::Integer + Clipper::Mappings["example"].map(self, "people") do |people| + people.field "name", Clipper::Types::String.new(200) + people.field "age", Clipper::Types::Integer end end - assert_kind_of(Beacon::Mappings::Mapping, repository.mappings[person]) + assert_kind_of(Clipper::Mappings::Mapping, repository.mappings[person]) end def test_mappings_is_a_mappings_collection - repository = Beacon::open("example", @uri.to_s) + repository = Clipper::open("example", @uri.to_s) - assert_kind_of(Beacon::Mappings, repository.mappings) + assert_kind_of(Clipper::Mappings, repository.mappings) end end \ No newline at end of file tests/integration/repository_test.rb @@ -3,22 +3,22 @@ require Pathname(__FILE__).dirname.parent + "helper" class Integration::SessionTest < Test::Unit::TestCase - include Beacon::Session::Helper + include Clipper::Session::Helper class Zoo - include Beacon::Model + include Clipper::Model orm.map(self, "zoos") do |zoos| zoos.key "id", Integer - zoos.field "name", Beacon::Types::String.new(200) + zoos.field "name", Clipper::Types::String.new(200) end end def setup - Beacon::open("default", "abstract://localhost/example") + Clipper::open("default", "abstract://localhost/example") end def teardown - Beacon::registrations.delete("default") + Clipper::registrations.delete("default") end def test_session_save_should_return_true tests/integration/session_test.rb @@ -12,7 +12,7 @@ class Integration::ValidationsTest < Test::Unit::TestCase def test_constraint_declarations assert_nothing_raised do - Beacon::constrain(@user, "test_constraint_declarations") do |check| + Clipper::constrain(@user, "test_constraint_declarations") do |check| check.size("name", 50) { |instance| instance.active? } check.required("name") @@ -31,34 +31,34 @@ class Integration::ValidationsTest < Test::Unit::TestCase end def test_default_validation_returns_invalid_result - Beacon::constrain(@user, 'default') do |check| + Clipper::constrain(@user, 'default') do |check| check.required('name') end user = @user.new - result = Beacon::validate(user) + result = Clipper::validate(user) assert_equal(false, result.valid?) assert_equal(1, result.errors.size) end def test_default_validation_returns_valid_result - Beacon::constrain(@user, 'default') do |check| + Clipper::constrain(@user, 'default') do |check| check.required('name') end user = @user.new user.name = 'Sample User' - result = Beacon::validate(user) + result = Clipper::validate(user) assert_equal(true, result.valid?) assert_equal(0, result.errors.size) end def test_multiple_context_validation - Beacon::constrain(@user, 'default') do |check| + Clipper::constrain(@user, 'default') do |check| check.required('name') end - Beacon::constrain(@user, 'email_marketing') do |check| + Clipper::constrain(@user, 'email_marketing') do |check| check.required('name') check.required('email') end @@ -66,13 +66,13 @@ class Integration::ValidationsTest < Test::Unit::TestCase # Validate in the default context user = @user.new user.name = 'Sample User' - result = Beacon::validate(user) + result = Clipper::validate(user) assert_equal(true, result.valid?) assert_equal(0, result.errors.size) # Validate in the email_marketing context user = @user.new - result = Beacon::validate(user, 'email_marketing') + result = Clipper::validate(user, 'email_marketing') assert_equal(false, result.valid?) assert_equal(2, result.errors.size) end tests/integration/validations_test.rb @@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname.parent.parent + "helper" class SerializableTest < Test::Unit::TestCase class City - include Beacon::Accessors::Serializable + include Clipper::Accessors::Serializable attr_accessor :name, :state_abbreviation @@ -22,7 +22,7 @@ class SerializableTest < Test::Unit::TestCase end class Person - include Beacon::Accessors + include Clipper::Accessors end def test_can_use_a_custom_serializable_type tests/unit/accessors/serializable_test.rb @@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname.parent.parent + "helper" class TypedAccessorTest < Test::Unit::TestCase class Person - include Beacon::Accessors + include Clipper::Accessors accessor :name => String accessor :age => Integer tests/unit/accessors/typed_accessor_test.rb @@ -3,6 +3,6 @@ require Pathname(__FILE__).dirname.parent + "helper" class CollectionTest < Test::Unit::TestCase def test_must_receive_array_as_initialization - assert_raises(ArgumentError) { Beacon::Collection.new("test") } + assert_raises(ArgumentError) { Clipper::Collection.new("test") } end end \ No newline at end of file tests/unit/collection_test.rb @@ -4,78 +4,78 @@ require Pathname(__FILE__).dirname.parent + "helper" class FieldTest < Test::Unit::TestCase def setup - @mappings = Beacon::Mappings.new - @people = Beacon::Mappings::Mapping.new(@mappings, Class.new, "people") - @addresses = Beacon::Mappings::Mapping.new(@mappings, Class.new, "addresses") - @string_type = Beacon::Types::String.new(255) + @mappings = Clipper::Mappings.new + @people = Clipper::Mappings::Mapping.new(@mappings, Class.new, "people") + @addresses = Clipper::Mappings::Mapping.new(@mappings, Class.new, "addresses") + @string_type = Clipper::Types::String.new(255) end def test_has_a_name_and_type - field = Beacon::Mappings::Field.new(@people, "name", @string_type) + field = Clipper::Mappings::Field.new(@people, "name", @string_type) assert_equal("name", field.name) - assert_kind_of(Beacon::Types::String, field.type) + assert_kind_of(Clipper::Types::String, field.type) end def test_only_accepts_defined_types assert_nothing_raised do - Beacon::Mappings::Field.new(@people, "name", @string_type) + Clipper::Mappings::Field.new(@people, "name", @string_type) end assert_nothing_raised do - Beacon::Mappings::Field.new(@people, "name", @string_type) + Clipper::Mappings::Field.new(@people, "name", @string_type) end assert_raise(ArgumentError) do - Beacon::Mappings::Field.new(@people, "name", nil) + Clipper::Mappings::Field.new(@people, "name", nil) end end def test_must_have_a_valid_name assert_nothing_raised do - Beacon::Mappings::Field.new(@people, "name", @string_type) + Clipper::Mappings::Field.new(@people, "name", @string_type) end assert_raise(ArgumentError) do - Beacon::Mappings::Field.new(@people, " ", @string_type) + Clipper::Mappings::Field.new(@people, " ", @string_type) end assert_raise(ArgumentError) do - Beacon::Mappings::Field.new(@people, nil, @string_type) + Clipper::Mappings::Field.new(@people, nil, @string_type) end assert_raise(ArgumentError) do - Beacon::Mappings::Field.new(@people, :name, @string_type) + Clipper::Mappings::Field.new(@people, :name, @string_type) end assert_raise(ArgumentError) do - Beacon::Mappings::Field.new(@people, Object.new, @string_type) + Clipper::Mappings::Field.new(@people, Object.new, @string_type) end end def test_fields_from_different_mappings_are_not_equal - people_id = @people.field("id", Beacon::Types::Integer.new) - addresses_id = @addresses.field("id", Beacon::Types::Integer.new) + people_id = @people.field("id", Clipper::Types::Integer.new) + addresses_id = @addresses.field("id", Clipper::Types::Integer.new) assert_not_equal(people_id, addresses_id) end def test_field_generates_an_accessor_on_target - zoos = Beacon::Mappings::Mapping.new(@mappings, Class.new, "zoos") - zoos.field("name", Beacon::Types::String.new(200)) + zoos = Clipper::Mappings::Mapping.new(@mappings, Class.new, "zoos") + zoos.field("name", Clipper::Types::String.new(200)) zoo = zoos.target.new assert_respond_to(zoo, :name) assert_respond_to(zoo, :name=) end def test_field_get_raises_on_different_type_object - zoos = Beacon::Mappings::Mapping.new(@mappings, Class.new, "zoos") + zoos = Clipper::Mappings::Mapping.new(@mappings, Class.new, "zoos") name = zoos.field("name", @string_type) assert_raise(ArgumentError) { name.get(Class.new.new) } end def test_field_get_returns_instance_value - zoos = Beacon::Mappings::Mapping.new(@mappings, Class.new, "zoos") + zoos = Clipper::Mappings::Mapping.new(@mappings, Class.new, "zoos") name = zoos.field("name", @string_type) zoo = zoos.target.new @@ -84,7 +84,7 @@ class FieldTest < Test::Unit::TestCase end def test_field_set_sets_instance_value - zoos = Beacon::Mappings::Mapping.new(@mappings, Class.new, "zoos") + zoos = Clipper::Mappings::Mapping.new(@mappings, Class.new, "zoos") name = zoos.field("name", @string_type) zoo = zoos.target.new @@ -94,7 +94,7 @@ class FieldTest < Test::Unit::TestCase def test_field_returns_scalar_default_value default_value = "Dallas" - zoos = Beacon::Mappings::Mapping.new(@mappings, Class.new, "zoos") + zoos = Clipper::Mappings::Mapping.new(@mappings, Class.new, "zoos") name = zoos.field("name", @string_type, default_value) zoo = zoos.target.new @@ -106,9 +106,9 @@ class FieldTest < Test::Unit::TestCase def test_field_returns_default_value_from_lambda default_value = lambda { "Dallas" } - zoos = Beacon::Mappings::Mapping.new(@mappings, Class.new, "zoos") + zoos = Clipper::Mappings::Mapping.new(@mappings, Class.new, "zoos") name = zoos.field("name", @string_type, default_value) - objid = zoos.field("objid", Beacon::Types::Integer, lambda { |instance| instance.object_id } ) + objid = zoos.field("objid", Clipper::Types::Integer, lambda { |instance| instance.object_id } ) zoo = zoos.target.new assert_equal("Dallas", zoo.name) tests/unit/field_test.rb @@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.parent + "helper" class MappingTest < Test::Unit::TestCase def test_mapping_has_a_target - mapping = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, Class.new, "mappings") + mapping = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, Class.new, "mappings") assert_respond_to(mapping, :target) end end \ No newline at end of file tests/unit/mapping_test.rb @@ -4,34 +4,34 @@ require Pathname(__FILE__).dirname.parent + "helper" class MappingsTest < Test::Unit::TestCase def test_indexer_raises_error_for_unmapped_class - mappings = Beacon::Mappings.new - assert_raise(Beacon::Mappings::UnmappedClassError) { mappings[Class.new] } + mappings = Clipper::Mappings.new + assert_raise(Clipper::Mappings::UnmappedClassError) { mappings[Class.new] } end def test_can_assign_a_mapping - mappings = Beacon::Mappings.new + mappings = Clipper::Mappings.new assert_nothing_raised do cow = Class.new - mapping = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, cow, "cows") + mapping = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, cow, "cows") mappings << mapping assert_equal(mapping, mappings[cow]) end end def test_assigning_non_mapping - mappings = Beacon::Mappings.new + mappings = Clipper::Mappings.new assert_raise(ArgumentError) { mappings << nil } end def test_mappings_should_be_enumerable - mappings = Beacon::Mappings.new + mappings = Clipper::Mappings.new assert_respond_to(mappings, :each) assert_kind_of(Enumerable, mappings) - cows = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, Class.new, 'cows') - pigs = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, Class.new, 'pigs') + cows = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, Class.new, 'cows') + pigs = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, Class.new, 'pigs') mappings << cows mappings << pigs tests/unit/mappings_test.rb @@ -3,48 +3,48 @@ require Pathname(__FILE__).dirname.parent + "helper" class QueryTest < Test::Unit::TestCase def setup - @uri = Beacon::Uri.new("jdbc:sqlite:///tmp/syntax.db") + @uri = Clipper::Uri.new("jdbc:sqlite:///tmp/syntax.db") @repository = @uri.driver.new("default", @uri) - @syntax = Beacon::Syntax::Sql.new(@repository) + @syntax = Clipper::Syntax::Sql.new(@repository) - @zoos = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, Class.new, "zoos") - @zoos.key @zoos.field("id", Beacon::Types::Serial) + @zoos = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, Class.new, "zoos") + @zoos.key @zoos.field("id", Clipper::Types::Serial) @zoos.field "city_id", Integer - @cities = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, Class.new, "cities") - @cities.field("city", Beacon::Types::String.new(200)) - @cities.field("state", Beacon::Types::String.new(200)) + @cities = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, Class.new, "cities") + @cities.field("city", Clipper::Types::String.new(200)) + @cities.field("state", Clipper::Types::String.new(200)) @cities.key(@cities["city"], @cities["state"]) end def test_query - # id_conditions = Beacon::Query::Condition.new(:eq, @zoos["id"], 1) - # query = Beacon::Query.new(@zoos, id_conditions) - # puts Beacon::Syntax::Sql.new(@repository).serialize(query.conditions) + # id_conditions = Clipper::Query::Condition.new(:eq, @zoos["id"], 1) + # query = Clipper::Query.new(@zoos, id_conditions) + # puts Clipper::Syntax::Sql.new(@repository).serialize(query.conditions) # - # city_condition = Beacon::Query::Condition.new(:eq, @cities["city"], "Dallas") - # state_condition = Beacon::Query::Condition.new(:eq, @cities["state"], "Texas") + # city_condition = Clipper::Query::Condition.new(:eq, @cities["city"], "Dallas") + # state_condition = Clipper::Query::Condition.new(:eq, @cities["state"], "Texas") # - # city_state = Beacon::Query::AndExpression.new(city_condition, state_condition) + # city_state = Clipper::Query::AndExpression.new(city_condition, state_condition) # - # query = Beacon::Query.new(@cities, city_state) - # puts Beacon::Syntax::Sql.new(@repository).serialize(query.conditions) + # query = Clipper::Query.new(@cities, city_state) + # puts Clipper::Syntax::Sql.new(@repository).serialize(query.conditions) end def test_query_paramaters_with_unbound_condition - id_conditions = Beacon::Query::Condition.new(:eq, @zoos["id"], 1) - query = Beacon::Query.new(@zoos, nil, id_conditions) + id_conditions = Clipper::Query::Condition.new(:eq, @zoos["id"], 1) + query = Clipper::Query.new(@zoos, nil, id_conditions) assert_equal([1], query.paramaters) end def test_query_paramaters_with_expression - city_condition = Beacon::Query::Condition.new(:eq, @cities["city"], "Dallas") - state_condition = Beacon::Query::Condition.new(:eq, @cities["state"], "Texas") + city_condition = Clipper::Query::Condition.new(:eq, @cities["city"], "Dallas") + state_condition = Clipper::Query::Condition.new(:eq, @cities["state"], "Texas") - city_state = Beacon::Query::AndExpression.new(city_condition, state_condition) - query = Beacon::Query.new(@cities, nil, city_state) + city_state = Clipper::Query::AndExpression.new(city_condition, state_condition) + query = Clipper::Query.new(@cities, nil, city_state) assert_equal(["Dallas", "Texas"], query.paramaters) end tests/unit/query_test.rb @@ -4,9 +4,9 @@ require Pathname(__FILE__).dirname.parent.parent + "helper" class SqliteSyntaxTest < Test::Unit::TestCase def setup @zoo = Class.new - @zoos = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, @zoo, "zoos") + @zoos = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, @zoo, "zoos") @zoos.key @zoos.field("id", Integer) - @zoos.field "city", Beacon::Types::String.new(200) + @zoos.field "city", Clipper::Types::String.new(200) end def test_asdf tests/unit/repositories/sqlite_syntax_test.rb @@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.parent + "helper" class RepositoryTest < Test::Unit::TestCase def setup - @uri = Beacon::Uri.new("abstract://localhost/example") + @uri = Clipper::Uri.new("abstract://localhost/example") end tests/unit/repository_test.rb @@ -3,19 +3,19 @@ require Pathname(__FILE__).dirname.parent + "helper" class SessionTest < Test::Unit::TestCase - include Beacon::Session::Helper + include Clipper::Session::Helper def setup - Beacon::open("default", "abstract://localhost/example") + Clipper::open("default", "abstract://localhost/example") end def teardown - Beacon::registrations.delete("default") + Clipper::registrations.delete("default") end def test_can_initialize_a_session assert_nothing_raised do - Beacon::Session.new("default") + Clipper::Session.new("default") end assert_nothing_raised do session = orm("default") @@ -23,14 +23,14 @@ class SessionTest < Test::Unit::TestCase end def test_has_a_repository - session = Beacon::Session.new("default") + session = Clipper::Session.new("default") assert_respond_to(session, :repository) - assert_equal(Beacon::registrations["default"], session.repository) + assert_equal(Clipper::registrations["default"], session.repository) end def test_has_a_mappings_shortcut - session = Beacon::Session.new("default") + session = Clipper::Session.new("default") assert_respond_to(session, :mappings) - assert_kind_of(Beacon::Mappings, session.mappings) + assert_kind_of(Clipper::Mappings, session.mappings) end end \ No newline at end of file tests/unit/session_test.rb @@ -4,17 +4,17 @@ require Pathname(__FILE__).dirname.parent + "helper" class SyntaxTest < Test::Unit::TestCase def setup - @uri = Beacon::Uri.new("jdbc:sqlite:///tmp/syntax.db") + @uri = Clipper::Uri.new("jdbc:sqlite:///tmp/syntax.db") @repository = @uri.driver.new("default", @uri) - @syntax = Beacon::Syntax::Sql.new(@repository) + @syntax = Clipper::Syntax::Sql.new(@repository) - @zoos = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, Class.new, "zoos") - @zoos.key @zoos.field("id", Beacon::Types::Serial) + @zoos = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, Class.new, "zoos") + @zoos.key @zoos.field("id", Clipper::Types::Serial) @zoos.field "city_id", Integer - @cities = Beacon::Mappings::Mapping.new(Beacon::Mappings.new, Class.new, "cities") - @cities.key @cities.field("id", Beacon::Types::Serial) + @cities = Clipper::Mappings::Mapping.new(Clipper::Mappings.new, Class.new, "cities") + @cities.key @cities.field("id", Clipper::Types::Serial) end def test_basic_serializations tests/unit/syntax_test.rb @@ -3,17 +3,17 @@ require Pathname(__FILE__).dirname.parent + "helper" class TypeTest < Test::Unit::TestCase - class TextTypeTest < Beacon::Type + class TextTypeTest < Clipper::Type end def teardown - types = Beacon::Types.instance_variable_get(:@types) + types = Clipper::Types.instance_variable_get(:@types) types.delete("TypeTest::TextTypeTest") types.delete("TextTypeTest") end def test_inherited_type_should_register_itself - assert_descendant_of(Beacon::Type, Beacon::Types["TypeTest::TextTypeTest"]) - assert_descendant_of(Beacon::Type, Beacon::Types["TextTypeTest"]) + assert_descendant_of(Clipper::Type, Clipper::Types["TypeTest::TextTypeTest"]) + assert_descendant_of(Clipper::Type, Clipper::Types["TextTypeTest"]) end end \ No newline at end of file tests/unit/type_test.rb @@ -11,21 +11,21 @@ class TypesTest < Test::Unit::TestCase # =============== def test_string_initializer - assert_raise(ArgumentError) { Beacon::Types::String.new() } - assert_raise(ArgumentError) { Beacon::Types::String.new('abc') } - assert_raise(ArgumentError) { Beacon::Types::String.new('123') } - assert_raise(ArgumentError) { Beacon::Types::String.new(23.23) } + assert_raise(ArgumentError) { Clipper::Types::String.new() } + assert_raise(ArgumentError) { Clipper::Types::String.new('abc') } + assert_raise(ArgumentError) { Clipper::Types::String.new('123') } + assert_raise(ArgumentError) { Clipper::Types::String.new(23.23) } - assert_nothing_raised { Beacon::Types::String.new(255) } + assert_nothing_raised { Clipper::Types::String.new(255) } end def test_string_convenience_method - assert_respond_to(Beacon::Types, :String) - assert_nothing_raised { Beacon::Types::String(255) } + assert_respond_to(Clipper::Types, :String) + assert_nothing_raised { Clipper::Types::String(255) } end def test_string_attributes - type = Beacon::Types::String(255) + type = Clipper::Types::String(255) assert_respond_to(type, :size) assert_equal(255, type.size) @@ -36,22 +36,22 @@ class TypesTest < Test::Unit::TestCase # =============== def test_float_initializer - assert_raise(ArgumentError) { Beacon::Types::Float.new() } - assert_raise(ArgumentError) { Beacon::Types::Float.new('abc', '123') } - assert_raise(ArgumentError) { Beacon::Types::Float.new(2, '123') } - assert_raise(ArgumentError) { Beacon::Types::Float.new('123', 2) } - assert_raise(ArgumentError) { Beacon::Types::Float.new(23.23, 123.2) } + assert_raise(ArgumentError) { Clipper::Types::Float.new() } + assert_raise(ArgumentError) { Clipper::Types::Float.new('abc', '123') } + assert_raise(ArgumentError) { Clipper::Types::Float.new(2, '123') } + assert_raise(ArgumentError) { Clipper::Types::Float.new('123', 2) } + assert_raise(ArgumentError) { Clipper::Types::Float.new(23.23, 123.2) } - assert_nothing_raised { Beacon::Types::Float.new(7, 2) } + assert_nothing_raised { Clipper::Types::Float.new(7, 2) } end def test_float_convenience_method - assert_respond_to(Beacon::Types, :Float) - assert_nothing_raised { Beacon::Types::Float.new(7, 2) } + assert_respond_to(Clipper::Types, :Float) + assert_nothing_raised { Clipper::Types::Float.new(7, 2) } end def test_float_attributes - type = Beacon::Types::Float(7, 2) + type = Clipper::Types::Float(7, 2) assert_respond_to(type, :scale) assert_respond_to(type, :precision) tests/unit/types_test.rb @@ -4,43 +4,43 @@ require Pathname(__FILE__).dirname.parent + "helper" class UriTest < Test::Unit::TestCase def setup - @uri = Beacon::Uri.new("abstract://user:password@name?charset=utf8") + @uri = Clipper::Uri.new("abstract://user:password@name?charset=utf8") dorb = Class.new do - self.const_set("Sqlite3", Class.new(Beacon::Repositories::Abstract)) + self.const_set("Sqlite3", Class.new(Clipper::Repositories::Abstract)) end - Beacon::Repositories.const_set("Dorb", dorb) + Clipper::Repositories.const_set("Dorb", dorb) end def teardown - Beacon::Repositories.send(:remove_const, "Dorb") + Clipper::Repositories.send(:remove_const, "Dorb") end def test_requires_one_argument - assert_equal(Beacon::Uri.instance_method("initialize").arity, 1) + assert_equal(Clipper::Uri.instance_method("initialize").arity, 1) end def test_initializes_with_string assert_nothing_raised do - Beacon::Uri.new("dorb:sqlite3:///#{Dir.pwd}/example.db") + Clipper::Uri.new("dorb:sqlite3:///#{Dir.pwd}/example.db") end assert_raises(ArgumentError) do - Beacon::Uri.new(URI::parse("dorb:sqlite3:///#{Dir.pwd}/example.db")) + Clipper::Uri.new(URI::parse("dorb:sqlite3:///#{Dir.pwd}/example.db")) end assert_raises(ArgumentError) do - Beacon::Uri.new(nil) + Clipper::Uri.new(nil) end assert_raises(ArgumentError) do - Beacon::Uri.new("") + Clipper::Uri.new("") end end def test_missing_driver_error - assert_raises(Beacon::Uri::MissingDriverError) do - Beacon::Uri.new("not:a:driver:///#{Dir.pwd}/example.db") + assert_raises(Clipper::Uri::MissingDriverError) do + Clipper::Uri.new("not:a:driver:///#{Dir.pwd}/example.db") end end @@ -49,7 +49,7 @@ class UriTest < Test::Unit::TestCase end def test_has_a_driver - assert_equal(Beacon::Repositories::Abstract, @uri.driver) + assert_equal(Clipper::Repositories::Abstract, @uri.driver) end def test_has_a_name tests/unit/uri_test.rb @@ -14,7 +14,7 @@ class ValidationContextTest < Test::Unit::TestCase @executed = false validation_block = lambda { |check| @executed = true } - context = Beacon::Validations::Context.new('mapping', "registration", &validation_block) + context = Clipper::Validations::Context.new('mapping', "registration", &validation_block) context.validate(Class.new.new) assert(@executed) @@ -23,10 +23,10 @@ class ValidationContextTest < Test::Unit::TestCase def test_validation_returns_validation_result validation_block = lambda { |check| @executed = true } - context = Beacon::Validations::Context.new('mapping', "registration", &validation_block) + context = Clipper::Validations::Context.new('mapping', "registration", &validation_block) result = context.validate(Class.new.new) - assert_kind_of(Beacon::Validations::ValidationResult, result) + assert_kind_of(Clipper::Validations::ValidationResult, result) end end tests/unit/validation_context_test.rb @@ -10,17 +10,17 @@ class ValidationResultTest < Test::Unit::TestCase end def test_initializer - assert_nothing_raised { Beacon::Validations::ValidationResult.new } + assert_nothing_raised { Clipper::Validations::ValidationResult.new } end def test_validation_result_is_valid - result = Beacon::Validations::ValidationResult.new + result = Clipper::Validations::ValidationResult.new assert_equal(true, result.valid?) assert_equal(false, result.invalid?) end def test_valiation_result_is_invalid - result = Beacon::Validations::ValidationResult.new + result = Clipper::Validations::ValidationResult.new result.append(Object.new, "Name is required", :name) tests/unit/validation_result_test.rb @@ -25,11 +25,11 @@ class ValidationTest < Test::Unit::TestCase end def setup - @errors = Beacon::Validations::ValidationResult.new + @errors = Clipper::Validations::ValidationResult.new end def test_validator_precondition - validator = Beacon::Validations::Validator.new + validator = Clipper::Validations::Validator.new validator.precondition_block = nil assert_equal(true, validator.should_run?(Class.new.new)) @@ -44,7 +44,7 @@ class ValidationTest < Test::Unit::TestCase end def test_absent_validator - minimum = Beacon::Validations::AbsenceValidator.new("name") + minimum = Clipper::Validations::AbsenceValidator.new("name") minimum.call(Person.new(nil), @errors) assert_empty(@errors) @@ -54,7 +54,7 @@ class ValidationTest < Test::Unit::TestCase end def test_absent_validator - v = Beacon::Validations::RequiredValidator.new("name") + v = Clipper::Validations::RequiredValidator.new("name") v.call(Person.new("Me"), @errors) assert_empty(@errors) @@ -64,7 +64,7 @@ class ValidationTest < Test::Unit::TestCase end def test_acceptance_validator - minimum = Beacon::Validations::AcceptanceValidator.new("name") + minimum = Clipper::Validations::AcceptanceValidator.new("name") minimum.call(Person.new("Jackson"), @errors) assert_empty(@errors) @@ -74,7 +74,7 @@ class ValidationTest < Test::Unit::TestCase end def test_minimum_length_validator - minimum = Beacon::Validations::MinimumLengthValidator.new("name", 3) + minimum = Clipper::Validations::MinimumLengthValidator.new("name", 3) minimum.call(Person.new("Jackson"), @errors) assert_empty(@errors) @@ -87,7 +87,7 @@ class ValidationTest < Test::Unit::TestCase end def test_maximum_length_validator - minimum = Beacon::Validations::MaximumLengthValidator.new("name", 7) + minimum = Clipper::Validations::MaximumLengthValidator.new("name", 7) minimum.call(Person.new("Jackson"), @errors) assert_empty(@errors) @@ -100,7 +100,7 @@ class ValidationTest < Test::Unit::TestCase end def test_format_validator - v = Beacon::Validations::FormatValidator.new("email", /\w+@\w+\.com/) + v = Clipper::Validations::FormatValidator.new("email", /\w+@\w+\.com/) v.call(OpenStruct.new(:email => "test@example.com"), @errors) assert_empty(@errors) @@ -110,7 +110,7 @@ class ValidationTest < Test::Unit::TestCase end def test_within_validator_with_range - v = Beacon::Validations::WithinValidator.new("age", 21..35) + v = Clipper::Validations::WithinValidator.new("age", 21..35) v.call(OpenStruct.new(:age => 21), @errors) assert_empty(@errors) @@ -126,7 +126,7 @@ class ValidationTest < Test::Unit::TestCase end def test_within_validator_with_array - v = Beacon::Validations::WithinValidator.new("gender", %w{M F}) + v = Clipper::Validations::WithinValidator.new("gender", %w{M F}) v.call(OpenStruct.new(:gender => 'M'), @errors) assert_empty(@errors) @@ -139,7 +139,7 @@ class ValidationTest < Test::Unit::TestCase end def test_size_validator - v = Beacon::Validations::SizeValidator.new("code", 5..8) + v = Clipper::Validations::SizeValidator.new("code", 5..8) v.call(OpenStruct.new(:code => '12345'), @errors) assert_empty(@errors) tests/unit/validation_test.rb caeb9e7c4f7a68a39f5fcaff27a2c3de968a846c Sam Smoot ssmoot@gmail.com http://github.com/wiecklabs/clipper/commit/553f3b7f3909cad54b338cf3f2cd13ff96e59846 553f3b7f3909cad54b338cf3f2cd13ff96e59846 2009-05-06T14:04:52-07:00 2009-05-06T14:04:52-07:00 Renamed to Clipper. 96f96891c8193b8f0c8b6b5cc03832a004ea5f00 Sam Smoot ssmoot@gmail.com