justools 1.2.4 → 1.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 1.3.0
+
+* Removing lots of methods no longer needed after ActiveSupport and Ruby 1.9+
+* Reorganizing directory structure
+
 == 1.2.2
 
 * Moving constant for regular expression to array/args_and_opts to allow each extension to be indepedently required

data/README.rdoc

@@ -10,23 +10,9 @@ Ruby-level extensions, utilities, convenience methods that I've found I'm consta
 
 === Object
 
-==== Object#as
+==== Object#aka
 
-    [:donkey, { :class => 'list-item' }].as { |arg, opts| link_to(arg, opts) }
-
-==== Object#is_included_in? (deprecated by ActiveSupport's newest Object#in?)
-
-    User.find(1).class.is_included_in?(User, Article, Authentication)
-		
-or alternatively:
-
-    @user.is_one_kind_of?(User, Article, Authentication)
-		
-which has the same effect as:
-
-    @user.is_one_kind_of?([User, Article, Authentication])
-
-by virtue of:
+    [:donkey, { :class => 'list-item' }].aka { |arg, opts| link_to(arg, opts) }
 
 === Array
 
@@ -132,4 +118,5 @@ http://github.com/caleon/justools/contributors
 
 == License
 
-MIT License. Copyright 2012 caleon.
+MIT License. Copyright 2013 caleon.
+

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.3.0

data/justools.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "justools"
-  s.version = "1.2.4"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["caleon"]
@@ -27,19 +27,18 @@ Gem::Specification.new do |s|
     "VERSION",
     "justools.gemspec",
     "lib/justools.rb",
-    "lib/justools/core_ext.rb",
+    "lib/justools/all.rb",
     "lib/justools/core_ext/array.rb",
     "lib/justools/core_ext/array/args_and_opts.rb",
     "lib/justools/core_ext/array/filters.rb",
     "lib/justools/core_ext/array/flatten_splat.rb",
     "lib/justools/core_ext/array/inquiry.rb",
     "lib/justools/core_ext/array/merge_options.rb",
-    "lib/justools/core_ext/class.rb",
     "lib/justools/core_ext/enumerable.rb",
     "lib/justools/core_ext/hash.rb",
     "lib/justools/core_ext/object.rb",
     "lib/justools/core_ext/set.rb",
-    "lib/tasks/core_utilities_tasks.rake",
+    "lib/tasks/justools_tasks.rake",
     "spec/justools_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/justools.rb

@@ -1,4 +1,3 @@
-# require 'justools/core_ext'
-
 module Justools
+  
 end

data/lib/justools/{core_ext.rb → all.rb}

@@ -1,4 +1,3 @@
-# require 'justools/core_ext/class'
 require 'justools/core_ext/object'
 require 'justools/core_ext/enumerable'
 require 'justools/core_ext/set'

data/lib/justools/core_ext/array/inquiry.rb

@@ -1,6 +1,4 @@
 require 'set'
-require 'justools/core_ext/object'
-require 'justools/core_ext/set'
 require 'justools/core_ext/array/flatten_splat'
 
 class Array
@@ -12,31 +10,12 @@ class Array
   def rearranged?(*other_ary)
     Set.new(self) == Set.new(other_ary.flatten_splat)
   end
-  alias_method :rearranges?, :rearranged?
   
-  def subset_of?(other_ary)
+  def subset?(other_ary)
     Set.new(self).subset?(Set.new(other_ary))
   end
-  alias_method :subset?, :subset_of?
   
-  def is_included_in?(other_ary)
+  def in?(other_ary)
     super || subset?(other_ary)
   end
-  alias_method :in?, :is_included_in?
-  
-  # Careful with this. This means 4 out of 5 elements can be the same but if not
-  # all of this self Array object are a part of other_ary, this returns true, as
-  # in "Yes, depite having 4 out of 5 in other_ary, I am excluded from the
-  # other_ary."
-  def out_of?(other_ary)
-    super || not_subset?(other_ary)
-  end
-  alias_method :is_excluded_from?, :out_of?
-
-  alias_method :include_one?, :include?
-  def include_all?(*other_ary)
-    other_ary.flatten_splat!
-    include_one(other_ary) || superset?(other_ary)
-  end
-  # alias_method :include?, :include_all?
 end

data/lib/justools/core_ext/object.rb

@@ -4,89 +4,14 @@ class Object
   
   # === Examples
   #
-  #   { :a=>1, .., :z=>26 }.as { |h| h.each { |k, v| h[k] = v + h[26 - v] } }
+  #   { :a=>1, .., :z=>26 }.aka { |h| h.each { |k, v| h[k] = v + h[26 - v] } }
   #
-  #   User.find(15).stories.joins(:tasks).as { |s| [s.class.to_s, s.count] }.
-  #        as { |klass_name, count| "#{count} stories in #{klass_name}" }
+  #   User.find(15).stories.joins(:tasks).aka { |s| [s.class.to_s, s.count] }.
+  #        aka { |klass_name, count| "#{count} stories in #{klass_name}" }
   #
   #   [15, { :includes => { :stories => :tasks } }, 56, 78, 102].
-  #        as { |id, opts, *ns| ns.each { |n| puts n }; User.find(id, opts) }
-  def as(&block)
+  #        aka { |id, opts, *ns| ns.each { |n| puts n }; User.find(id, opts) }
+  def aka(&block)
     yield self
   end
-  
-  # === Examples
-  #
-  #   user = User.find_by_id(10).or_else { |res| raise "Got back #{res}" }
-  def or_else(&block)
-    self || yield(self)
-  end
-  
-  # === Examples
-  #
-  #   authorization = User.find_by_id(10).and_also { |u| u.authorization }
-  def and_also(&block)
-    self && yield(self)
-  end
-  
-  # unless Object.method_defined?(:in?)
-    # Copy of Object#in? from Rails 3.2.1 which also allows list.
-    #
-    # === Parameters
-    #
-    # * +args+ - Array or a list of its contents.
-    def in?(*args)
-      if args.length > 1
-        args.include? self
-      else
-        another_object = args.first
-        if another_object.respond_to? :include?
-          another_object.include?(self)
-        else
-          raise ArgumentError.new("The single parameter passed to #in? must respond to #include?")
-        end
-      end
-    end
-  # end
-  # def is_included_in?(*others) #d deprecated
-  #   others.flatten_splat.include?(self)
-  # end
-  alias_method :is_included_in?, :in?
-  
-  def out_of?(*others)
-    others.flatten_splat.exclude?(self)
-  end
-  alias_method :is_excluded_from?, :out_of?
-
-  # Similar to is_a? or kind_of? but with an array of possible classes.
-  # Returns the matching class or a nil.
-  #
-  # === Parameters
-  #
-  # * +klasses+ - List of Class constants, or an Array of Class constants.
-  #
-  # === Examples
-  #
-  #   rec_or_num.one_kind_of?(User, Admin).or_else { User.find(rec_or_num) }
-  def one_kind_of?(*klasses)
-    klasses.flatten_splat.detect { |klass| self.kind_of?(klass) }
-  end
-  alias_method :is_one_kind_of?, :one_kind_of?
-  
-  # Similar to is_a? or kind_of? but with an array of possible classes.
-  # Returns the matching class or a nil. Renamed here from is_one_kind_of?
-  # because it uses the 'klass === self' which isn't necessarily equivalent to
-  # 'self.is_a?(klass)'.
-  #
-  # === Parameters
-  #
-  # * +args+ - List of arguments.
-  #
-  # === Examples
-  #
-  #   rec_or_num.one_of?(User, Admin).or_else { User.find(rec_or_num) }
-  def one_of?(*args)
-    args.flatten_splat.detect { |arg| arg === self}
-  end
-  alias_method :is_when?, :one_of?
 end

data/lib/justools/core_ext/set.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 class Set
   def not_subset?(set)
     set.is_a?(Set) or raise ArgumentError, "value must be a set"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: justools
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -109,19 +109,18 @@ files:
 - VERSION
 - justools.gemspec
 - lib/justools.rb
-- lib/justools/core_ext.rb
+- lib/justools/all.rb
 - lib/justools/core_ext/array.rb
 - lib/justools/core_ext/array/args_and_opts.rb
 - lib/justools/core_ext/array/filters.rb
 - lib/justools/core_ext/array/flatten_splat.rb
 - lib/justools/core_ext/array/inquiry.rb
 - lib/justools/core_ext/array/merge_options.rb
-- lib/justools/core_ext/class.rb
 - lib/justools/core_ext/enumerable.rb
 - lib/justools/core_ext/hash.rb
 - lib/justools/core_ext/object.rb
 - lib/justools/core_ext/set.rb
-- lib/tasks/core_utilities_tasks.rake
+- lib/tasks/justools_tasks.rake
 - spec/justools_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/caleon/justools
@@ -139,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -73736662650008813
+      hash: -3606103884830383195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/justools/core_ext/class.rb

@@ -1,41 +0,0 @@
-# Not enabling until fixed.
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/module/aliasing'
-
-class Class
-  # Purpose is to be able to define a default value for a class_attribute when
-  # one isn't initially set.
-  def class_attribute_with_default(*attrs)
-    hash = attrs.last.is_a?(Hash) ? attrs.pop : {}
-    my_default = hash.delete(:default)
-    instance_writer = hash.blank? || hash[:instance_writer]
-
-    attrs.each do |name|
-      # By the way, FIXME: i think this should be broken because if i want to
-      # use a string as a default, that will not be reflected.
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def self.#{name}() #{my_default || 'nil'} end
-        def self.#{name}?() !!#{name} end
-
-        def self.#{name}=(val)
-          singleton_class.class_eval do
-            remove_possible_method(:#{name})
-            define_method(:#{name}) { val }
-          end
-          val
-        end
-
-        def #{name}
-          defined?(@#{name}) ? @#{name} : singleton_class.#{name}
-        end
-
-        def #{name}?
-          !!#{name}
-        end
-      RUBY
-
-      attr_writer name if instance_writer
-    end
-  end
-  alias_method_chain :class_attribute, :default
-end