circuits 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzIxYzBlMDM5ZmJjYjliOWZkODEwM2QxNGUwYmE5ZGIxMWZlYzFkZg==
+    NzU2MmI0ZGE1MTA5YjllOWE3NTdiOGFhOTJlOTI3OTI4ZGQ5M2RmOA==
   data.tar.gz: !binary |-
-    Y2E3NDYzMjVmMWY3OWI4MjliZmE5NTRlMTIyMDAwZTRmMGM5ZjNhZg==
+    MGM4Y2QwMTI3OTM1NGUyNjdhNzE3NzYyMDQyNzIyNzk5ZDk3NGMxZA==
 SHA512:
   metadata.gz: !binary |-
-    MTJhMDdmNzE2ZDYyMjAzYjkyMGJlMmRkNmNhYjc4NTZhMzliYmM1MzZiNjdh
-    OGUwMzY2ZWM0OThjYTQyNDIwYTZmOWMxYTdlOTA3ODAwZDhiZjI2NmE0NjEy
-    ZTA1MDg2MTE4NmMyMWI2YTgzYzhjMzRiNmQzOTY4MGZhNTM5YjM=
+    Y2UwZGRjZGVlOTc0ZTVkNDcxMjkyMjRhNjU0OWNiYWQxZDg5YTA2NzgyZWM4
+    ODYzMjNkM2QyNGYxMGVjYzRjOGY1ODEwMjc4ZTAxNWJjYzNiZTJjZThkY2Zl
+    MGQ0MTAyZTcwOWFhZGMwY2M2YjZkOWM1NjQyYzEwZmE3MmJkNzE=
   data.tar.gz: !binary |-
-    MjM5YzM1OTE2MTZlZDc4ZjdlNDI1ODgzNTkxNmUxZWVjYjgyNGFkNDU4Yjlh
-    MTZiNjY0MDM5OGJlMzRiNjc0ZjU3YjM5MzU3NzM5ZWQyNDVmZTE2ZjRlYTdl
-    MDVhZjViYjc2MTlhNTc5ZWU1NGYzM2E5YzYzMGIxMDI5MmYyZDM=
+    MjljM2I5M2FmNTFmOTIyNGI2MDkwMjQ0YTZmNzM4ZDU5OTAzZWNiOTA2Mzlh
+    OTkzMGUyNzgzMDEyZTBlNzczMTNmNGYzNmYyZmU5YjBjMDQyOWIyZmJiMDE0
+    MmMwZmFjMWYyNTZlNTFlNzNhOWRlM2M0NjE1NWQ5ZjFjZGY3YTY=

data/README.md

@@ -51,7 +51,8 @@ and_gate[:out].get # false
 
 ```ruby
 and_gate = Circuits::Component::And.new
-not_gate = Circuits::Component::Not.new(inputs: [and_gate[:out]])
+not_gate = Circuits::Component::Not.new
+not_gate[:in].set = and_gate[:out]
 ```
 
 ## Contributing

data/lib/circuits/component/base.rb

@@ -1,5 +1,4 @@
-require 'circuits/terminal/input'
-require 'circuits/terminal/output'
+require 'circuits/terminal'
 
 module Circuits
   # A component has a set of inputs an outputs. Every `tick` a componnent
@@ -69,7 +68,7 @@ module Circuits
         elsif opts[:inputs].class == Fixnum
           @input_count = opts[:inputs]
         end
-        @inputs ||= @input_count.times.collect { Circuits::Terminal::Input.new }
+        @inputs ||= @input_count.times.collect { Circuits::Terminal.new }
       end
 
       def create_outputs(opts)
@@ -80,7 +79,7 @@ module Circuits
           @output_count = opts[:outputs]
         end
         @outputs ||= @output_count.times.collect do
-          Circuits::Terminal::Output.new
+          Circuits::Terminal.new
         end
       end
 

data/lib/circuits/component/sr_nand.rb

@@ -9,13 +9,16 @@ module Circuits
         super opts
         create_sub_components
         link_sub_components
+        self[:q].set nand_1[:out]
+        self[:not_q].set nand_2[:out]
       end
 
       # Computes the outputs based on the inputs and previous state
       def tick
-        update_sub_components
-        self[:q].set nand_1[:out].get
-        self[:not_q].set nand_2[:out].get
+        2.times.each do
+          sub_components.each(&:tick)
+          sub_components.each(&:tock)
+        end
       end
 
       private
@@ -45,13 +48,6 @@ module Circuits
           not_q: { type: :output, number: 1 }
         }
       end
-
-      def update_sub_components
-        2.times.each do
-          sub_components.each(&:tick)
-          sub_components.each(&:tock)
-        end
-      end
     end
   end
 end

data/lib/circuits/component/sr_nor.rb

@@ -7,28 +7,31 @@ module Circuits
       def initialize(opts = {})
         set_defaults
         super opts
-        create_internal_components
-        link_internal_components
+        create_sub_components
+        link_sub_components
+        self[:q].set nor_1[:out]
+        self[:not_q].set nor_2[:out]
       end
 
       # Computes the outputs based on the inputs and previous state
       def tick
-        update_internal_components
-        self[:q].set nor_1[:out].get
-        self[:not_q].set nor_2[:out].get
+        2.times.each do
+          sub_components.each(&:tick)
+          sub_components.each(&:tock)
+        end
       end
 
       private
 
       attr_reader :nor_1, :nor_2, :sub_components
 
-      def create_internal_components
+      def create_sub_components
         @nor_1 = Nor.new
         @nor_2 = Nor.new
         @sub_components = [@nor_1, @nor_2]
       end
 
-      def link_internal_components
+      def link_sub_components
         nor_1[:a] = self[:r]
         nor_2[:a] = self[:s]
         nor_1[:b] = nor_2[:out]
@@ -45,13 +48,6 @@ module Circuits
           not_q: { type: :output, number: 1 }
         }
       end
-
-      def update_internal_components
-        2.times.each do
-          sub_components.each(&:tick)
-          sub_components.each(&:tock)
-        end
-      end
     end
   end
 end

data/lib/circuits/terminal.rb

@@ -1,5 +1,35 @@
 module Circuits
   # A terminal holds a logical state, it can be attatched to components
-  module Terminal
+  class Terminal
+    # Creates the terminal
+    # @param opts [Hash] Options to create the Output with
+    # @option opts [Boolean] :state The initial state of the Output
+    def initialize(opts = {})
+      @terminal = opts[:terminal]
+      @next_state = opts[:state] || false
+      @state = opts[:state] || false
+    end
+
+    # Gets the state of the terminal
+    # @return [Boolean] The state of the output
+    def get
+      @state
+    end
+
+    # The other terminal to read from next {#tock} or a state to be in now
+    # @param [Boolean, Terminal] terminal The terminal or state to output
+    def set(terminal)
+      if terminal.class == Terminal
+        @terminal = terminal
+      else
+        @terminal = nil
+        @state = @next_state = terminal
+      end
+    end
+
+    # Sets the state to be that of the terminal or state last passed by {#set}
+    def tock
+      @state = @terminal.nil? ? @next_state : @terminal.get
+    end
   end
 end

data/lib/circuits/version.rb

@@ -1,5 +1,5 @@
 # Circuits allows you to express logical circuits in code
 module Circuits
   # The version of the Circuits gem
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/spec/unit/circuits/terminal_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+require 'circuits/terminal'
+
+describe Circuits::Terminal do
+  describe '#get' do
+    let(:state) { double('state') }
+
+    context 'when given no state' do
+      subject { Circuits::Terminal.new }
+
+      it 'is false' do
+        expect(subject.get).to eq(false)
+      end
+    end
+
+    context 'when given a state' do
+      subject { Circuits::Terminal.new(state: state) }
+
+      it 'has that state' do
+        expect(subject.get).to eq(state)
+      end
+    end
+
+    context 'when given terminal' do
+      let(:terminal) { Circuits::Terminal.new(state: state) }
+
+      subject { Circuits::Terminal.new(terminal: terminal) }
+
+      it 'is false' do
+        expect(subject.get).to eq(false)
+      end
+    end
+  end
+
+  describe '#set' do
+    let(:state_1) { double('state_1') }
+    let(:state_2) { double('state_2') }
+
+    context 'when given a state' do
+      subject { Circuits::Terminal.new(state: state_1) }
+
+      it 'gets set immediately' do
+        subject.set state_2
+        expect(subject.get).to eq(state_2)
+      end
+    end
+
+    context 'when given a terminal' do
+      let(:terminal) { Circuits::Terminal.new(state: state_2) }
+
+      subject { Circuits::Terminal.new(state: state_1) }
+
+      it 'gets does not get set immediately' do
+        subject.set terminal
+        expect(subject.get).to eq(state_1)
+      end
+    end
+  end
+
+  describe '#tock' do
+    let(:state) { double('state') }
+
+    context 'when passed a state' do
+      subject { Circuits::Terminal.new }
+
+      it 'moves next set to get' do
+        subject.set state
+        subject.tock
+        expect(subject.get).to eq(state)
+      end
+    end
+
+    context 'when given terminal' do
+      let(:terminal) { Circuits::Terminal.new(state: state) }
+
+      subject { Circuits::Terminal.new(terminal: terminal) }
+
+      it 'is has that state' do
+        subject.tock
+        expect(subject.get).to eq(state)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circuits
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Henry Muru Paenga
@@ -135,8 +135,6 @@ files:
 - lib/circuits/component/xnor.rb
 - lib/circuits/component/xor.rb
 - lib/circuits/terminal.rb
-- lib/circuits/terminal/input.rb
-- lib/circuits/terminal/output.rb
 - lib/circuits/version.rb
 - spec/spec_helper.rb
 - spec/unit/circuits/component/and_spec.rb
@@ -149,8 +147,7 @@ files:
 - spec/unit/circuits/component/sr_nor_spec.rb
 - spec/unit/circuits/component/xnor_spec.rb
 - spec/unit/circuits/component/xor_spec.rb
-- spec/unit/circuits/terminal/input_spec.rb
-- spec/unit/circuits/terminal/output_spec.rb
+- spec/unit/circuits/terminal_spec.rb
 homepage: https://github.com/meringu/circuits
 licenses:
 - MIT
@@ -187,5 +184,4 @@ test_files:
 - spec/unit/circuits/component/sr_nor_spec.rb
 - spec/unit/circuits/component/xnor_spec.rb
 - spec/unit/circuits/component/xor_spec.rb
-- spec/unit/circuits/terminal/input_spec.rb
-- spec/unit/circuits/terminal/output_spec.rb
+- spec/unit/circuits/terminal_spec.rb

data/lib/circuits/terminal/input.rb

@@ -1,30 +0,0 @@
-require 'circuits/terminal'
-
-module Circuits
-  module Terminal
-    # Reads from a single output, only assigned to one component
-    class Input
-      # Creates the input
-      # @param opts [Hash] Options to create the Input with
-      # @option opts [Component::Output] :output The output to read from
-      def initialize(opts = {})
-        @output = opts[:output] || Circuits::Terminal::Output.new
-      end
-
-      # The output the input reads from
-      attr_accessor :output
-
-      # Forward get to the output
-      # @return [Boolean] The state of the output
-      def get
-        @output.get
-      end
-
-      # Create a new output to use
-      # @param [Boolean] s The state of the output to create
-      def set(s)
-        @output = Circuits::Terminal::Output.new(state: s)
-      end
-    end
-  end
-end

data/lib/circuits/terminal/output.rb

@@ -1,37 +0,0 @@
-require 'circuits/terminal'
-
-module Circuits
-  module Terminal
-    # Belongs to a single component, gets set for reading by inputs
-    class Output
-      # Creates the output
-      # @param opts [Hash] Options to create the Output with
-      # @option opts [Boolean] :state The initial state of the Output
-      def initialize(opts = {})
-        @next_state = opts[:state] || false
-        @state = opts[:state] || false
-      end
-
-      # Gets the state of the output
-      # @return [Boolean] The state of the output
-      def get
-        state
-      end
-
-      # Saves the state
-      # @param [Boolean] s The next desired state of the output
-      def set(s)
-        @next_state = s
-      end
-
-      # Sets the state to be the last state passed by #set
-      def tock
-        @state = next_state
-      end
-
-      private
-
-      attr_reader :state, :next_state
-    end
-  end
-end

data/spec/unit/circuits/terminal/input_spec.rb

@@ -1,60 +0,0 @@
-require 'spec_helper'
-require 'circuits/terminal/input'
-
-module Circuits
-  module Terminal
-    class Output
-    end
-  end
-end
-
-describe Circuits::Terminal::Input do
-  let(:output) { double('output') }
-
-  describe '#initialize' do
-    context 'when given an output' do
-      subject { Circuits::Terminal::Input.new(output: output) }
-
-      it 'sets the output' do
-        expect(subject.output).to eq(output)
-      end
-    end
-
-    context 'when not given an output' do
-      subject { Circuits::Terminal::Input.new }
-
-      before do
-        expect(Circuits::Terminal::Output).to receive(:new).and_return(output)
-      end
-
-      it 'sets the output' do
-        expect(subject.output).to eq(output)
-      end
-    end
-  end
-
-  describe '#get' do
-    let(:res) { double('res') }
-
-    subject { Circuits::Terminal::Input.new(output: output) }
-
-    it 'forwards the request to output' do
-      expect(output).to receive(:get).and_return(res)
-      expect(subject.get).to eq(res)
-    end
-  end
-
-  describe '#set' do
-    let(:state) { double('state') }
-    let(:new_output) { double('new_output', get: state) }
-
-    subject { Circuits::Terminal::Input.new(output: output) }
-
-    it 'sets the output to the passed output' do
-      expect(Circuits::Terminal::Output).to receive(:new)
-        .with(state: state).and_return(new_output)
-      subject.set state
-      expect(subject.get).to eq(state)
-    end
-  end
-end

data/spec/unit/circuits/terminal/output_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'circuits/terminal/output'
-
-describe Circuits::Terminal::Output do
-  describe '#get' do
-    context 'when given no state' do
-      subject { Circuits::Terminal::Output.new }
-
-      it 'is false' do
-        expect(subject.get).to eq(false)
-      end
-    end
-
-    context 'when given false state' do
-      subject { Circuits::Terminal::Output.new(state: false) }
-
-      it 'is false' do
-        expect(subject.get).to eq(false)
-      end
-    end
-
-    context 'when given true state' do
-      subject { Circuits::Terminal::Output.new(state: true) }
-
-      it 'is true' do
-        expect(subject.get).to eq(true)
-      end
-    end
-  end
-
-  describe '#set' do
-    let(:state_1) { double('state_1') }
-    let(:state_2) { double('state_2') }
-
-    subject { Circuits::Terminal::Output.new(state: state_1) }
-
-    it 'does not set get immediately' do
-      subject.set state_2
-      expect(subject.get).to eq(state_1)
-    end
-  end
-
-  describe '#tock' do
-    let(:state) { double('state') }
-
-    subject { Circuits::Terminal::Output.new }
-
-    it 'moves next set to get' do
-      subject.set state
-      subject.tock
-      expect(subject.get).to eq(state)
-    end
-  end
-end