setfu 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134e00fed065a113e94ad7aa53d038a3123ce7e2
-  data.tar.gz: c255f820ed6460f627da42276830fa2a03cf1bbc
+  metadata.gz: 72565070f36393bad5dc9eb8cbeba0dd49804c9a
+  data.tar.gz: c1efb9f7cff8811a55282d31f6cbe0eda66a1bff
 SHA512:
-  metadata.gz: c6da933de018e78187a64b1000c8cfd0c1da26eaa00a88e74668193b171f803e83b25340c90a6607ea96dab1f4a16988d9e171f41762646351ef88ef2888e26c
-  data.tar.gz: 5da251f1351be7e684a20bdb490edccee46da8a06aab0d1c81748b6d200c746909a154ed564ef1efd8d32d579e40023957345b635877d83c2d702dfe6ca591b3
+  metadata.gz: 1256c103b03a79bfc631377c9eea812cbea1743fb7526a7c1fbd1edc366f04edc6fe6777a1ba320bb14d8290924bf701af2f7720327dfcabb7a9255d63488842
+  data.tar.gz: 729b9b90ff87bda5ccd4b70f9241daed3a613ac16d9b74933903c79fe5bf0d5ba732aaf4cc659ad156d473c94b356caef1f4bec6d9a383111a73aa4ea91783ee

data/lib/setfu/version.rb

@@ -1,3 +1,3 @@
 module Setfu
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/setfu.rb

@@ -325,8 +325,11 @@ class Set
   end
 
   def include?(items)
+    return false if @bits == 0   # empty sets include nothing including other empty sets
     if(items.class==Set)
-      return (@bits & items.to_i) == items.to_i
+      tmp = @bits & items.to_i
+      return false if tmp==0
+      return (tmp) == items.to_i
     elsif(items.class==Range)
       f=items.first.ord
       l=items.last.ord
@@ -336,11 +339,13 @@ class Set
       t = t << f
       return (@bits & t) == t
     elsif(items.respond_to? :each_char)
+      return false if items.empty?
       items.each_char do |item|
         t = 1 << item.ord
         return false if 0 == (t & @bits)
       end
     elsif(items.respond_to? :each)
+      return false if items.empty?
       items.each do |item|
         return false if false==include?(item)
       end
@@ -377,7 +382,7 @@ class Set
   def to_s
     rtn = ""
     each_member do |ch|
-      rtn += ch.chr
+      rtn += ch.chr(Encoding::UTF_8)
     end
     rtn
   end
@@ -385,7 +390,7 @@ class Set
   def to_a(int = true)
     rtn = []
     each_member do |num|
-      rtn.push int ? num : num.chr
+      rtn.push int ? num : num.chr(Encoding::UTF_8)
     end
     rtn
   end
@@ -399,7 +404,7 @@ class Set
     th -= 1
     each_member do |num|
       # byebug unless int
-      rtn.push int ? num : num.chr
+      rtn.push int ? num : num.chr(Encoding::UTF_8)
       if ((last+1)==num)
         # byebug if cnt.nil?
         cnt += 1
@@ -514,13 +519,13 @@ class Set
       when :array_chars
         rtn = []
         ary.each do |elm|
-          rtn.push elm.chr
+          rtn.push elm.chr(Encoding::UTF_8)
         end
         return rtn
       when :string
         rtn = []
         ary.each do |elm|
-          rtn.push elm.chr
+          rtn.push elm.chr(Encoding::UTF_8)
         end
         return rtn.join ""
       else # :set
@@ -671,3 +676,12 @@ class Range
   include SetFuMixinBinarySubsetOperator
   include SetFuMixinBinaryProperOperator
 end
+
+=begin
+# BAD IDEA ... nil is usually an error
+class NilClass  # treat nil as empty set
+  def to_set
+    return Set.new
+    end
+end
+=end

data/setfu.gemspec

@@ -26,7 +26,7 @@ When characters are used, the ordinate value sets the element bit of the interna
   spec.required_ruby_version = '>= 1.9.1'
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", ">= 10.1.0"
-  spec.add_development_dependency 'rspec', ">= 3.3.0"
-  spec.add_development_dependency 'byebug', ">= 5.0.0"
+  spec.add_development_dependency 'rake', '~> 10.1', '>= 10.1.0'
+  spec.add_development_dependency 'rspec', '~> 3.3', '>= 3.3.0'
+  spec.add_development_dependency 'byebug', '~> 5.0', '>= 5.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setfu
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Bryan Colvin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,6 +28,9 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
@@ -35,6 +38,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
@@ -42,6 +48,9 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0
@@ -49,6 +58,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0
@@ -56,6 +68,9 @@ dependencies:
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -63,6 +78,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0