darkholme 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01c0f59d1ded420b19d3e3657a5ae959f9be117b
-  data.tar.gz: a5b2e646ad6e72baac1a8f232afbfbd7bee3c090
+  metadata.gz: d7f5734cf9be7bcbb2db728178e3d95b0a21fe50
+  data.tar.gz: eb4aeb5870c13a2052432b085d303424b9df3f00
 SHA512:
-  metadata.gz: 371176ad264d101af62235dc3be3080b04f74615b1ec24a1470e442d47681a954036daffe96bcc80bef11ae98d29ca3e72b58bd5d0a1a8af7f8240f06094dd60
-  data.tar.gz: 7580e14ada9937d6ed39fd833731296df32597fdb6e64e7ac9fb51ab92c427bad4f2e3fd72e7621bf8cca42824cbee9e611555de6fe3b7cdf54c33b0d79ca92e
+  metadata.gz: e5a997b59776b89125032d1b5b783ee307034808e82c7f140e75e5158be249deda0299c08f96cb4cd8719d152d11f3a72da658006de1bbfd23f105fdb3b231b2
+  data.tar.gz: 47b7c73f984e928f72c8316df35f1e4c3ab233619ffc26ac1c923fbe87f1b14f3fa900f51942cf8bb27a68e49f0e1df8a95ee5382c98b640cbf7a68a2239ba5e

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+gem "multi_json", "~> 1.8.4"
+
 group :development do
   gem "pry", "~> 0.9.12.6"
   gem "rspec", "~> 3.0.0.beta1"

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/darkholme.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: darkholme 1.1.0 ruby lib
+# stub: darkholme 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "darkholme"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Massive Danger"]
-  s.date = "2014-03-01"
+  s.date = "2014-04-06"
   s.description = "An entity-component system in Ruby"
   s.email = "evan@massivedanger.com"
   s.extra_rdoc_files = [
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<multi_json>, ["~> 1.8.4"])
       s.add_development_dependency(%q<pry>, ["~> 0.9.12.6"])
       s.add_development_dependency(%q<rspec>, ["~> 3.0.0.beta1"])
       s.add_development_dependency(%q<yard>, ["~> 0.7"])
@@ -68,6 +69,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<guard-rspec>, ["~> 4.2.6"])
       s.add_development_dependency(%q<inch>, ["~> 0.2.3"])
     else
+      s.add_dependency(%q<multi_json>, ["~> 1.8.4"])
       s.add_dependency(%q<pry>, ["~> 0.9.12.6"])
       s.add_dependency(%q<rspec>, ["~> 3.0.0.beta1"])
       s.add_dependency(%q<yard>, ["~> 0.7"])
@@ -79,6 +81,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<inch>, ["~> 0.2.3"])
     end
   else
+    s.add_dependency(%q<multi_json>, ["~> 1.8.4"])
     s.add_dependency(%q<pry>, ["~> 0.9.12.6"])
     s.add_dependency(%q<rspec>, ["~> 3.0.0.beta1"])
     s.add_dependency(%q<yard>, ["~> 0.7"])

data/lib/darkholme.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'multi_json'
 
 require 'darkholme/bitset'
 require 'darkholme/engine'

data/lib/darkholme/component.rb

@@ -18,7 +18,7 @@ module Darkholme
     # @param data [Hash] The arguments passed from the JSON file
     #
     # @return [Component] A new component instance
-    def self.from_json(data = {})
+    def self.from_manifest(data = {})
       new
     end
 

data/lib/darkholme/engine.rb

@@ -26,6 +26,16 @@ module Darkholme
       entity.added_to_engine self
     end
 
+    # Add an entity from a manifest file
+    #
+    # @param manifest [Object] An Object that is acceptable to JSON.parse
+    #
+    # @return Result of #add_entity
+    def add_entity_from_manifest(manifest)
+      entity = Entity.load(manifest)
+      add_entity(entity)
+    end
+
     # Remove an entity from the engine (with callbacks). Once removed,
     # the entity will no longer be updated during the update loop
     #

data/lib/darkholme/entity.rb

@@ -6,14 +6,14 @@ module Darkholme
 
     # Create a new Entity from a JSON manifest
     #
-    # @param source [Object] An object that works with JSON.parse
+    # @param source [Object] An object that works with MultiJson.load
     #
     # @return [Entity] The new Entity
     def self.load(source)
-      data = JSON.parse(source)
+      data = MultiJson.load(source)
       components = []
-      data["components"].each do |component_class, args|
-        components << class_from_string(component_class).from_json(args)
+      data["components"].each do |component_class, data|
+        components << class_from_string(component_class).from_manifest(data)
       end
 
       entity = new

data/spec/lib/darkholme/component_spec.rb

@@ -17,8 +17,8 @@ module Darkholme
       expect(subject.bit).to eq(:bit)
     end
 
-    it "can be made from_json" do
-      component = MockComponent.from_json({})
+    it "can be made from a manifest" do
+      component = MockComponent.from_manifest {}
       expect(component).to be_a MockComponent
     end
   end

data/spec/lib/darkholme/engine_spec.rb

@@ -13,6 +13,12 @@ module Darkholme
         }.to change { subject.entities.count }.from(0).to(1)
       end
 
+      it "can add them from a manifest" do
+        expect {
+          subject.add_entity_from_manifest(entity_json)
+        }.to change { subject.entities.count }.from(0).to(1)
+      end
+
       it "can remove them" do
         subject.add_entity(entity)
 
@@ -75,6 +81,18 @@ module Darkholme
         expect(subject.families[family]).not_to include(entity)
       end
     end
+
+    private
+
+    def entity_json
+      <<-JSON
+{
+  "components": {
+    "MockComponent": {}
+  }
+}
+      JSON
+    end
   end
 end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: darkholme
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Massive Danger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement