elite_universe 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: be8f3ad02eeb0a06f99168895873e68d3291b595
-  data.tar.gz: 25e5958265a027994d04aae793dc86e0ee278026
+SHA256:
+  metadata.gz: ad122bcb1e33808aab6afd7f2838dfcbd1b00cf55a167b90b873f38dc0862a37
+  data.tar.gz: f2cf4dff439959ea227090530f34a86519e68a72fa80af1d7209a341f318e1ed
 SHA512:
-  metadata.gz: 36695193d73d4e9b8243d8671d6d1b61f62f1b660256e01223c443dcec4cc6db3718ebb87cece912f10e9b44f13a91f627666b1d46bd0473ef26870d21cce944
-  data.tar.gz: 7a9b56bacdb0becdc89d01beed47520454ead7f992d96767e6ae74fd2ee8ce3611f2fc193e949fa8fcbe6eaf39e5dd3188694cfc35b4f5c209aec40245ff27c9
+  metadata.gz: c0db1cb366a2c1cdf8649bef96ebcf597cc108704253c0e57eb50ecc5f4b25df3c91047f58ea8cbf45203713f99cac280291100a7b8d22c1f33222ba4d7b7ea8
+  data.tar.gz: 5cf23fb0fe096b129bd1022cef43d8662a74a42a0940aaac692ee4f02bff2df116c9701b27f3b7cae17b91eb9cd2512921d27835875a38d7e7270d00f9992b04

data/README.md

@@ -18,8 +18,7 @@ planet.name                      # = Lave
 require 'elite_universe/galaxy'
 
 galaxy = EliteUniverse::Galaxy.new(23114, 584, 46931)
-galaxy.planets                  # = array of 'EliteUniverse::Planet's
-galaxy.planets[129].name        # = Zaonce
+galaxy[129].name        # = Zaonce
 ```
 
 `EliteUniverse::Galaxy` is an Enumerable class and so, for example, a full list
@@ -29,6 +28,12 @@ of planet names in the galaxy can be generated with:
 galaxy.map(&:name)
 ```
 
+## Deprecated methods
+
+`galaxy.planets` will return an array of all instances of
+`EliteUniverse::Planet` in an `EliteUniverse::Galaxy`. This is deprecated.
+Instead of `galaxy.planets[i]` use `galaxy[i]`.
+
 ## License
 
 The Elite Universe gem is available to everyone under the terms of the MIT

data/lib/elite_universe/galaxy.rb

@@ -5,19 +5,24 @@ module EliteUniverse
     include Enumerable
 
     def initialize a, b, c
-      @w = [ a, b, c ]
+      @initial_planet = Planet.new(a, b, c)
     end
 
-    def planets
-      p = [ EliteUniverse::Planet.new(*@w)]
-      255.times do
-        p << p[-1].next
+    def each &block
+      256.times.inject(@initial_planet) do |p|
+        block.call(p)
+        p.next
       end
-      p
     end
 
-    def each &block
-      planets.each { |planet| block.call(planet) }
+    def planets
+      puts "DEPRECATED"
+      puts "In place of `galaxy.planets[n]` use `galaxy[n]`"
+      self.map { |p| p }
+    end
+
+    def [] n
+      n.times.inject(@initial_planet) { |p| p.next }
     end
   end
 end

data/lib/elite_universe/planet.rb

@@ -28,35 +28,30 @@ module EliteUniverse
     end
 
     def name
-      name = ''
-      v = @w
-      l = v[0] & 64
-      4.times do |i|
-        if i < 3 or l > 0
-          n = ( v[2] >> 8 ) & 31
-          name += CHARS[n]
-        end
-        v = twist v
-      end
-      name.gsub('.', '').capitalize
+      (@w[0] & 64 == 0 ? 2 : 3).times.inject([@w]) do |vs|
+        vs << twist(vs[-1])
+      end.inject('') do |name, v|
+        name += CHARS[(v[2] >> 8) & 31]
+      end.tr('.', '').capitalize
     end
 
     def government
-      GOVS[ gov_n ]
+      GOVS[gov_n]
     end
 
     def economy
-      ECONS[ econ_n ]
+      ECONS[econ_n]
     end
 
     def location
-      [ @w[1] >> 8, @w[0] >> 8 ]
+      [@w[1] >> 8, @w[0] >> 8]
     end
 
     def technology
-      t = ((@w[1] >> 8 ) & 3) + ( econ_n ^ 7 ) + (gov_n >> 1) + 1
-      t += 1 if ((gov_n & 1) == 1)
-      t
+      ((@w[1] >> 8 ) & 3) +
+        (econ_n ^ 7) +
+        (gov_n >> 1) +
+        ((gov_n & 1) == 1 ? 2 : 1)
     end
 
     def next
@@ -64,17 +59,26 @@ module EliteUniverse
     end
 
     private
+
+    def version_at_least version
+      # ... because I want to use new features if possible
+      Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(version)
+    end
+
     def twist arr
-      [ arr[1], arr[2], arr.inject(:+) % 65536 ]
+      [
+        arr[1],
+        arr[2],
+        (version_at_least('2.4.0') ? arr.sum : arr.inject(:+)) % 65536
+      ]
     end
 
     def gov_n
-      ( @w[1] >> 3 ) & 7
+      (@w[1] >> 3) & 7
     end
 
     def econ_n
-      e = ( @w[0] >> 8 ) & 7
-      gov_n <= 1 ? e | 2 : e
+      ((@w[0] >> 8) & 7) | (gov_n <= 1 ? 2 : 0)
     end
   end
 end

data/lib/elite_universe/version.rb

@@ -1,3 +1,3 @@
 module EliteUniverse
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elite_universe
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Elite Universe