censu 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4559d825ab0107a88621e834e5c295d22ea9bd1e
-  data.tar.gz: f81d8b69428f260fda5f923abf33e507ee4e4278
+SHA256:
+  metadata.gz: b83daf6ddb78d97687a6f5cf07460e1de49f28b10b91f89cfaf98c0279b05652
+  data.tar.gz: ed0bad88402f63cf4a6961386cb763b1ab20af8c71e611957f76c7c9042af457
 SHA512:
-  metadata.gz: 772e63dbeb8a54759c2c5441d28f627c2281ffff57cd0a5a5735b6e5ef8ceec6fe82fb415eb15928ec7d9994e091de7c02c884694b61999591b1632f15473bc8
-  data.tar.gz: 1d9c9286ea07305fc39555b458b130480928d1425d4b3e18292845c6025c1f0c5ccdc311cba30e1a331865bcb471e43979c78cb2b0614028b7484d7c9e3c0463
+  metadata.gz: 719b55f148ead33e32e3ef7d8290e05212d9efa80d4cbf407448bde0d1adee8ecb2d845b4fd5797fd88c8f5b7497a243e7bbb71aaf7168cfc67f05a8a08b8d2a
+  data.tar.gz: d246faf28d7f19dfc9a390d96200042bbc4a606f3c4a0889f64384ebdc2a0d9eb11c12ffbce83e8220fd2a93ea7de39d23c33ebb7eaabb9aa4218d97391a780a

data/.gitignore

@@ -1,8 +1,52 @@
-/.bundle
-/.env
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+.env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
 /.yardoc/
-/Gemfile.lock
+/_yardoc/
 /doc/
-/pkg/
-/vendor/cache/*.gem
-/vendor/bundle
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+Gemfile.lock
+.ruby-version
+.ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+.vscode

data/.rubocop.yml

@@ -1,5 +1,5 @@
 # Relaxed.Ruby.Style
-## Version 2.1
+## Version 2.2
 
 Style/Alias:
   Enabled: false
@@ -113,9 +113,13 @@ Style/TrailingCommaInArguments:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarguments
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
   Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarrayliteral
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainhashliteral
 
 Style/WhileUntilModifier:
   Enabled: false
@@ -139,10 +143,6 @@ Metrics/AbcSize:
 Metrics/BlockNesting:
   Enabled: false
 
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*'
-
 Metrics/ClassLength:
   Enabled: false
 

data/LICENSE.txt

@@ -1,7 +1,7 @@
-Copyright 2017 ninoseki(Manabu Niseki)
+Copyright 2018 ninoseki
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -10,7 +10,6 @@
 
 Ruby API client to the [Censys] internet search engine.
 
-
 ## Examples
 
 Initialize the API:
@@ -107,9 +106,9 @@ end
 
 ## License
 
-See {file:LICENSE.txt} for details.
+MIT License.
 
-Note:: This gem is forked from [trailofbits/censys-ruby](https://github.com/trailofbits/censys-ruby).
+**Note:** This gem is forked from [trailofbits/censys-ruby](https://github.com/trailofbits/censys-ruby).
 
 [ruby]: http://www.ruby-lang.org/
 [Censys]: https://censys.io/

data/lib/censys/api.rb

@@ -84,8 +84,8 @@ module Censys
     #   Censys - My Account
     #
     def initialize(id = ENV['CENSYS_ID'], secret = ENV['CENSYS_SECRET'])
-      raise(ArgumentError, "'id' argument required") if id.nil? || id.empty?
-      raise(ArgumentError, "'secret' argument required") if secret.nil? || secret.empty?
+      raise(ArgumentError, "'id' argument is required") if id.nil? || id.empty?
+      raise(ArgumentError, "'secret' argument is required") if secret.nil? || secret.empty?
 
       @id, @secret = id, secret
 

data/lib/censys/data/series.rb

@@ -29,4 +29,4 @@ module Censys
       end
     end
   end
-end
+end

data/lib/censys/document/has_location.rb

@@ -9,7 +9,7 @@ module Censys
       # @return [Location]
       #
       def location
-        @location ||= Location.new(@attributes['location'])
+        @location ||= Location.new(@attributes['location'] || @attributes)
       end
     end
   end

data/lib/censys/location.rb

@@ -36,19 +36,24 @@ module Censys
     # @param [Hash{String => Object}] attributes
     #
     def initialize(attributes)
-      @postal_code = attributes['postal_code']
-      @city        = attributes['city']
-      @province    = attributes['province']
-      @country     = attributes['country']
-      @continent   = attributes['continent']
-
-      @registered_country      = attributes['registered_country']
-      @registered_country_code = attributes['registered_country_code']
+      @attributes = attributes
+
+      @postal_code = self['postal_code']
+      @city        = self['city']
+      @province    = self['province']
+      @country     = self['country']
+      @continent   = self['continent']
+      @registered_country      = self['registered_country']
+      @registered_country_code = self['registered_country_code']
+      @timezone = self['timezone']
+      @latitude  = self['latitude']
+      @longitude = self['longitude']
+    end
 
-      @timezone = attributes['timezone']
+    private
 
-      @latitude  = attributes['latitude']
-      @longitude = attributes['longitude']
+    def [](key)
+      @attributes[key] || @attributes["location.#{key}"]
     end
   end
 end

data/lib/censys/search/ipv4.rb

@@ -1,8 +1,11 @@
 require 'censys/search/result'
+require 'censys/document/has_location'
 
 module Censys
   module Search
     class IPv4 < Result
+      include Censys::Document::HasLocation
+
       def ip
         @attributes['ip']
       end

data/lib/censys/version.rb

@@ -1,4 +1,4 @@
 module Censys
   # censys version
-  VERSION = "0.1.4".freeze
+  VERSION = "0.1.5".freeze
 end

data/spec/search_spec.rb

@@ -10,7 +10,11 @@ describe Censys::API do
       it "should return IPv4 response" do
         res = @api.ipv4.search(query: "dropbox.com")
         expect(res).to be_a(Search::Response)
+
         expect(res.metadata).to be_a(Search::Metadata)
+        expect(res.metadata.count).to be_a(Integer)
+        expect(res.metadata.query).to eq("dropbox.com")
+
         expect(res.each).to be_a(Enumerator)
         expect(res.pages).to be_a(Enumerator)
 
@@ -18,6 +22,9 @@ describe Censys::API do
         expect(first).to be_a(Search::IPv4)
         expect(first.ip).to be_a(String)
         expect(first.protocols).to be_a(Array)
+
+        expect(first.location).to be_a(Location)
+        expect(first.location.country).to be_a(String)
       end
     end
 
@@ -26,6 +33,10 @@ describe Censys::API do
         res = @api.websites.search(query: "dropbox.com")
         expect(res).to be_a(Search::Response)
 
+        expect(res.metadata).to be_a(Search::Metadata)
+        expect(res.metadata.count).to be_a(Integer)
+        expect(res.metadata.query).to eq("dropbox.com")
+
         first = res.results.first
         expect(first).to be_a(Search::Website)
         expect(first.domain).to be_a(String)
@@ -38,6 +49,10 @@ describe Censys::API do
         res = @api.certificates.search(query: "dropbox.com")
         expect(res).to be_a(Search::Response)
 
+        expect(res.metadata).to be_a(Search::Metadata)
+        expect(res.metadata.count).to be_a(Integer)
+        expect(res.metadata.query).to eq("dropbox.com")
+
         first = res.results.first
         expect(first).to be_a(Search::Certificate)
         expect(first.fingerprint_sha256).to be_a(String)

data/spec/view_spec.rb

@@ -12,12 +12,15 @@ describe Censys::API do
         expect(view).to be_a(Censys::IPv4)
         expect(view.tags).to be_a(Array)
         expect(view.updated_at).to be_a(Time)
+
         expect(view.autonomous_system).to be_a(AutonomousSystem)
+        expect(view.autonomous_system.routed_prefix).to eq("8.8.8.0/24")
+
         expect(view.location).to be_a(Location)
+        expect(view.location.city).to eq("Mountain View")
+
         expect(view.ports).to be_a(Hash)
         expect(view.protocols).to be_a(Array)
-        expect(view["location.city"]).to eq("Mountain View")
-        expect(view.dig("location", "city")).to eq("Mountain View")
 
         expect(view.ip).to eq("8.8.8.8")
         expect(view.to_s).to eq("8.8.8.8")
@@ -33,13 +36,13 @@ describe Censys::API do
         expect(view.to_s).to eq("google.com")
         expect(view.alexa_rank).to be_a(Integer)
 
-        expect(view["80.http.get.body"]).to be_a(String)
-
         expect(view.http_response).to be_a(Censys::HTTPResponse)
         expect(view.http_response.body).to be_a(String)
         expect(view.http_response.header).to be_a(Hash)
         expect(view.http_response.status_code).to eq(200)
         expect(view.http_response.title).to eq("Google")
+
+        expect(view["80.http.get.body"]).to be_a(String)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: censu
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,7 +135,6 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
-- ChangeLog.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -210,7 +209,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: API client for censys.io

data/ChangeLog.md

@@ -1,4 +0,0 @@
-### 0.1.0 / 2016-02-18
-
-* Initial release:
-