circuits 0.9.1 → 0.9.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWM4NjAyMGY2NDY2OTEwYmUyOTIzNmRmZDJjODJiMGVhYWEyMjJiNQ==
+    NGUwZTZhZWY5NmMwMGM2MmEwMDJmNWU3YTgzZjAwMjFjOWRlODA2MA==
   data.tar.gz: !binary |-
-    MmM5NTg0ZjU1ZGNiNjM4MjU2OGQ5ZWY0ZmVlZTVhNWZmYTE5YTkzMg==
+    MDNjMDhjODE2YjE5NWViNmMxMGE1OWQzNDlmZTk0MGQ5NWZlNjNhZQ==
 SHA512:
   metadata.gz: !binary |-
-    YmJkOTU1ODU4Zjg0OTFkZTdiZWQzMmMxNTYxZWM3ZjY0Yzk5NzA1N2M5Mjk1
-    YjcxMmM3ZDZmNmRhZDFiYjFlMzBjN2E3NWE2YjhkMjI1MDk1Nzc4Y2FkZTc5
-    NWI1YzBkMWU4YTFmNTkxNTEzZTlmY2ZhODNhYTY0MzQ4MWFkY2U=
+    MjhiZWFiYzE1NGY0MGY1NjgxNjVlNWFkNjJlNjY0NzA1ZTgwYTFjZmU0Y2I2
+    OTJjNmI2MTAxYzE4MmMwNjJmMDExZmEzMjg3ZTU3YTM2NDg2MTA5OTRiMmUx
+    OGM3MDYwMTVmOTgwNjlkODI5ZTFlNDc5MDdlN2UyNWE5MTMwY2U=
   data.tar.gz: !binary |-
-    ZDMyN2E2MzI4ZjhhZjI4MzQ3OGZkNjllNjYxNDljNjBlNWY3MjdiNDQ3M2Fi
-    NmM3OThkZGMxNjhjMTBiZjBhOTA2OWVkZjNiODhhOWRiNzlkMzE2N2VjYjkz
-    ZGU0NGY5MmI5ZTE2NWZkYjcyOWI5ZDdlZDg5YTg3OTA2ZDNmODg=
+    YzBiODA1NWYyY2U4OGY0MTA4MTM5Y2MxZGZkYzk3YTE3N2M1ZTFlNzExM2Mx
+    YjY4Mjk4MTZjNWQxNzVmZjUyMDNiZTc3M2Y3NzRjZDZlY2ZhZDQ2NzZiYjBk
+    NTZmZjE1Y2YzOTY0MjU3Y2ZhOTllOWI5ODUwM2YwYTAwOGQ2MGU=

data/lib/circuits/component/d.rb

@@ -3,7 +3,7 @@ require 'circuits/component/nand'
 
 module Circuits
   module Component
-    # Positive edge triggered flip flop
+    # Positive edge triggered D-type flip flop
     class D < Base
       def initialize
         super(port_mappings: { d: { type: :input, number: 0 },
@@ -12,6 +12,7 @@ module Circuits
                                not_q: { type: :output, number: 1 } })
         create_sub_components
         link_sub_components
+        reset
       end
 
       # Computes the outputs based on the inputs and previous state
@@ -75,6 +76,11 @@ module Circuits
         link_sr_nand_clk
         link_sr_nand_out
       end
+
+      def reset
+        tick
+        tock
+      end
     end
   end
 end

data/lib/circuits/component/sr_nand.rb

@@ -11,9 +11,8 @@ module Circuits
                                q: { type: :output, number: 0 },
                                not_q: { type: :output, number: 1 } })
         create_sub_components
-        link_inputs
-        link_outputs
         link_sub_components
+        reset
       end
 
       # Computes the outputs based on the inputs and previous state
@@ -42,9 +41,14 @@ module Circuits
         2
       end
 
-      def link_inputs
-        nand_s[:a].set self[:not_s]
+      def link_nand_r
         nand_r[:a].set self[:not_r]
+        nand_r[:b].set nand_s[:out]
+      end
+
+      def link_nand_s
+        nand_s[:a].set self[:not_s]
+        nand_s[:b].set nand_r[:out]
       end
 
       def link_outputs
@@ -53,8 +57,16 @@ module Circuits
       end
 
       def link_sub_components
-        nand_s[:b].set nand_r[:out]
-        nand_r[:b].set nand_s[:out]
+        link_nand_s
+        link_nand_r
+        link_outputs
+      end
+
+      def reset
+        self[:not_s].set true
+        tick
+        tock
+        self[:not_r].set true
       end
     end
   end

data/lib/circuits/component/sr_nor.rb

@@ -11,9 +11,8 @@ module Circuits
                                q: { type: :output, number: 0 },
                                not_q: { type: :output, number: 1 } })
         create_sub_components
-        link_inputs
-        link_outputs
         link_sub_components
+        reset
       end
 
       # Computes the outputs based on the inputs and previous state
@@ -42,9 +41,14 @@ module Circuits
         2
       end
 
-      def link_inputs
+      def link_nor_r
         nor_r[:a].set self[:r]
+        nor_r[:b].set nor_s[:out]
+      end
+
+      def link_nor_s
         nor_s[:a].set self[:s]
+        nor_s[:b].set nor_r[:out]
       end
 
       def link_outputs
@@ -53,8 +57,16 @@ module Circuits
       end
 
       def link_sub_components
-        nor_r[:b].set nor_s[:out]
-        nor_s[:b].set nor_r[:out]
+        link_nor_s
+        link_nor_r
+        link_outputs
+      end
+
+      def reset
+        self[:r].set true
+        tick
+        tock
+        self[:r].set false
       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.9.1'
+  VERSION = '0.9.2'
 end

data/spec/unit/circuits/component/d_spec.rb

@@ -5,6 +5,20 @@ describe Circuits::Component::D do
   describe '#tick' do
     subject { Circuits::Component::D.new }
 
+    context 'it has just been initialized' do
+      it 'is unset' do
+        expect(subject[:q].get).to eq(false)
+        expect(subject[:not_q].get).to eq(true)
+      end
+
+      it 'is stable' do
+        subject.tick
+        subject.tock
+        expect(subject[:q].get).to eq(false)
+        expect(subject[:not_q].get).to eq(true)
+      end
+    end
+
     context 'has just been set' do
       before do
         subject[:clk].set false

data/spec/unit/circuits/component/sr_nand_spec.rb

@@ -5,6 +5,20 @@ describe Circuits::Component::SrNand do
   describe '#tick' do
     subject { Circuits::Component::SrNand.new }
 
+    context 'it has just been initialized' do
+      it 'is unset' do
+        expect(subject[:q].get).to eq(false)
+        expect(subject[:not_q].get).to eq(true)
+      end
+
+      it 'is stable' do
+        subject.tick
+        subject.tock
+        expect(subject[:q].get).to eq(false)
+        expect(subject[:not_q].get).to eq(true)
+      end
+    end
+
     context 'is set' do
       before do
         subject[:not_s].set false

data/spec/unit/circuits/component/sr_nor_spec.rb

@@ -5,6 +5,20 @@ describe Circuits::Component::SrNor do
   describe '#tick' do
     subject { Circuits::Component::SrNor.new }
 
+    context 'it has just been initialized' do
+      it 'is unset' do
+        expect(subject[:q].get).to eq(false)
+        expect(subject[:not_q].get).to eq(true)
+      end
+
+      it 'is stable' do
+        subject.tick
+        subject.tock
+        expect(subject[:q].get).to eq(false)
+        expect(subject[:not_q].get).to eq(true)
+      end
+    end
+
     context 'is set' do
       before do
         subject[:r].set false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circuits
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Henry Muru Paenga